From: Michael Vogt Date: Wed, 16 Nov 2005 16:21:04 +0000 (+0000) Subject: * merged with apt--mvo--0 X-Git-Tag: 0.7.24ubuntu1~254^2~5 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7230ad48a5c7766281c824c7373ecc8900e25995 * merged with apt--mvo--0 Patches applied: * apt@packages.debian.org/apt--sources-list-d--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-30 * apt@packages.debian.org/apt--sources-list-d--0--patch-1 Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d * bubulle@debian.org--2005/apt--main--0--patch-96 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-97 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-98 Update PO files with the POT * bubulle@debian.org--2005/apt--main--0--patch-99 Added Galician translation * bubulle@debian.org--2005/apt--main--0--patch-100 Completed Danish translation * bubulle@debian.org--2005/apt--main--0--patch-101 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-102 Merge with Michael Vogt's archive * bubulle@debian.org--2005/apt--main--0--patch-103 Update the POT files and all PO files to resync with recent code * bubulle@debian.org--2005/apt--main--0--patch-104 French translation completed * bubulle@debian.org--2005/apt--main--0--patch-105 Proofread by Fred Bothamy * bubulle@debian.org--2005/apt--main--0--patch-106 Merge with mvo * bubulle@debian.org--2005/apt--main--0--patch-107 Italian translation corrected * bubulle@debian.org--2005/apt--main--0--patch-108 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-109 Italian translation completed * bubulle@debian.org--2005/apt--main--0--patch-110 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-111 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-112 Swedish translation completed * bubulle@debian.org--2005/apt--main--0--patch-113 Silly update to French translation (testing) * bubulle@debian.org--2005/apt--main--0--patch-114 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-115 Basque translation completed * bubulle@debian.org--2005/apt--main--0--patch-116 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-117 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-118 Russian translation update by Yuri Kozlov * bubulle@debian.org--2005/apt--main--0--patch-119 Merge with Michael and add update-po as a pre-req for binary * bubulle@debian.org--2005/apt--main--0--patch-120 Re-generate all PO Files * bubulle@debian.org--2005/apt--main--0--patch-121 Complete French translation * bubulle@debian.org--2005/apt--main--0--patch-122 Correct typography in French translation * bubulle@debian.org--2005/apt--main--0--patch-123 Spelling fix for consistency in French translation * bubulle@debian.org--2005/apt--main--0--patch-124 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-125 Fixed localization of y/n questions in German translation * bubulle@debian.org--2005/apt--main--0--patch-126 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-127 Complete Tagalog translation / Add Changelog * bubulle@debian.org--2005/apt--main--0--patch-128 Danish translation update * bubulle@debian.org--2005/apt--main--0--patch-129 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-130 Galician translation completed * bubulle@debian.org--2005/apt--main--0--patch-131 Simplified Chinese translation update * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-5 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-6 * fixed a incorrect po/he.po merge * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-110 * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-1 * initial patch to make falling back from cdrom possible * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-2 * fix in methods/cdrom.cc: don't call Fail() but return false so that apt can fallback to a differencent source * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-10 * fix a bug in a man-page, fix a problem with overly long lines in apt-cdrom * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-11 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-12 * fix a incorrect error message (it always added .gz regardless what was downloaded) * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-13 * merged with main * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-14 * added Hashsum support for file and cdrom * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-15 * added README.arch * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-16 * merged with main * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-17 * move the changelog to the right place * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-18 * Change pkgPolicy::Pin from private to protected * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-19 * added a default constructor for PrvIterator * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-20 * applied otavios patch to reread the statusFile on debSystem::Initialize * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-33 * merged with matt's tree * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-34 * merged with matts tree * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-35 * build debian and ubuntu package from the same source * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-36 * added debian/patches dir * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-37 * fix the breakage from my last commit (note to self: always, _always_ run baz diff before a commit) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-38 * removed the lsb_release build patch (nobody except me seems to like it) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-39 * merged from main * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-40 * merged the apt--sane-handle-timeout--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-41 * merged apt--bts225947--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-42 * merged with apt--main * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-43 * added patch that adds a apt-secure man-page (thanks to jfs@computer.org) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-44 * added author credits * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-45 * added apt-ftparchive.conf example * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-46 * corrected the utf8 of javier fernandes pena * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-47 * improve the timeout handling (again) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-48 * merged with apt--fixes--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-49 * README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators.h order in initlist changed to remove warning * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-50 * meda-change message is send over status-fd now * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-51 * include a human readable string for the MediaChange status-fd message as well * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-52 * finalizing changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-53 * check ctime as well in cron.daily when cleaning up packages in apt.cron.daily * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-54 * fix a stupid typo in apt.cron.daily * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55 * fix apt-pkg/cdrom.cc to umount the cdrom again if anything fails * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56 * merged from apt--cdrom-fallback--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-57 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-58 * better error string for a failed dpkg-source * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-59 * make sure that the pkgRecords D'tor does not segfault * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-60 * merged updated french man-page * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-61 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62 * leak fix for debian #250583 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65 * inital support for "apt-get source -t dist" (but no downgrades yet * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66 * full support for apt-get source -t now (and honor pining too) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67 * added APT::Authentication::Trust-CDROM option * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68 * fix a crash in apt-ftparchive * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69 * sparc64 alignment fix * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70 * fix segfault when there is no Archive for a VerFile * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71 * don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72 * corrections in the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73 * init the default ScreenWidth to 79 columns by default (Closes: #324921) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74 apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75 * seting section to "admin" to match override file * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76 * finalized the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77 * renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78 * fix a incorrect example * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79 * revert patch from patch-59, causes all sorts of trouble * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80 * fix changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81 * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83 * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84 * added armeb to archtable * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85 * merged with bubulle, changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86 * merged the NMU from Franz Pop, fixed armeb problem (#333599) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87 * removed double armeb entry in buildlib/sizetable * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88 * finalized changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89 * turn off "secure-acquire" when --allow-unauthenticated is given * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90 * merged the sources.list.d patch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93 * sources.list.d documented * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-3 * merged with main * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1 * implemented "TrustCDROM" mode * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2 * added APT::Authentication::TrustCDROM to the configure-index * otavio@debian.org--2005/apt--fixes--0--patch-28 Reread status configuration, needed for clients using independent apt ... * philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-1 French L10N update * philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-2 Generate correctly french manpages --- 7230ad48a5c7766281c824c7373ecc8900e25995 diff --cc apt-pkg/packagemanager.cc index 05615db79,155408bb4..cc87444ea --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@@ -631,11 -631,12 +631,11 @@@ pkgPackageManager::OrderResult pkgPacka // --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ -pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd) +pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd) { - OrderResult Res = OrderInstall(); - if (Res != Failed) - if (Go(status_fd) == false) - return Failed; - return Res; + if(DoInstallPreFork() == Failed) + return Failed; + - return DoInstallPostFork(); ++ return DoInstallPostFork(statusFd); } /*}}}*/ diff --cc configure.in index 614c41352,6130ab544..bc5d2b572 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.6.40.2") -AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.42.4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index af57cc2b4,2a636ae30..8ebc2e755 --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,89 +1,89 @@@ - apt (0.6.40.2) unstable; urgency=low + apt (0.6.42.4) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: + * zh_CN.po: Completed to 507 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + - -- ++ -- Michael Vogt Wed, 16 Nov 2005 17:13:05 +0100 + + apt (0.6.42.3) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: + - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) + - patch-119: add update-po as a pre-req for binary (closes: #329910) + - patch-121: Complete French translation + - patch-125: Fixed localization of y/n questions in German translation + (closes: #337078) + - patch-126: Swedish translation update (closes: #337163) + - patch-127: Complete Tagalog translation (closes: #337306) + - patch-128: Danish translation update (closes: #337949) + - patch-129: Basque translation update (closes: #338101) + * cmdline/apt-get.cc: + - bufix in FindSrc (closes: #335213, #337910) + * added armeb to archtable (closes: #333599) + * with --allow-unauthenticated use the old fallback behaviour for + sources (closes: #335112) + + -- Michael Vogt Wed, 9 Nov 2005 07:22:31 +0100 + + apt (0.6.42.2) unstable; urgency=high + + * NMU (approved by maintainer) + * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500). + * Add big-endian arm (armeb) support (closes: #333599). + * Priority high to get the AMD key into testing ASAP. + + -- Frans Pop Sun, 30 Oct 2005 21:29:11 +0100 + + apt (0.6.42.1) unstable; urgency=low + + * fix a incorrect example in the apt_prefrences man page + (thanks to Filipus Klutiero, closes: #282918) + * apt-pkg/pkgrecords.cc: + - revert patch from last version, it causes trouble on alpha + and ia64 (closes: #335102, #335103) + * cmdline/apt-get.cc: + - be extra carefull in FindSrc (closes: #335213) + + -- Michael Vogt Sat, 22 Oct 2005 23:44:35 +0200 + + apt (0.6.42) unstable; urgency=low + + * apt-pkg/cdrom.cc: + - unmount the cdrom when apt failed to locate any package files + * allow cdrom failures and fallback to other sources in that case + (closes: #44135) + * better error text when dpkg-source fails + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115: + - patch-99: Added Galician translation + - patch-100: Completed Danish translation (Closes: #325686) + - patch-104: French translation completed + - patch-109: Italian translation completed + - patch-112: Swedish translation update + - patch-115: Basque translation completed (Closes: #333299) + * applied french man-page update (thanks to Philippe Batailler) + (closes: #316638, #327456) + * fix leak in the mmap code, thanks to Daniel Burrows for the + patch (closes: #250583) + * support for apt-get [build-dep|source] -t (closes: #152129) + * added "APT::Authentication::TrustCDROM" option to make the life + for the installer people easier (closes: #334656) + * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch) + (closes: #334671) + * apt-pkg/contrib/md5.cc: + - fix a alignment problem on sparc64 that gives random bus errors + (thanks to Fabbione for providing a test-case) + * init the default ScreenWidth to 79 columns by default + (Closes: #324921) + * cmdline/apt-cdrom.cc: + - fix some missing gettext() calls (closes: #334539) + * doc/apt-cache.8.xml: fix typo (closes: #334714) + + -- Michael Vogt Wed, 19 Oct 2005 22:02:09 +0200 + + apt (0.6.41) unstable; urgency=low * improved the support for "error" and "conffile" reporting from dpkg, added the format to README.progress-reporting diff --cc po/apt-all.pot index bca32b327,7ed987c02..4d9621307 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-11-02 18:56-0500\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -148,7 -148,7 +148,7 @@@ msgstr " #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2375 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -523,7 -535,7 +535,7 @@@ msgstr " msgid "Y" msgstr "" - #: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1532 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -682,11 -694,11 +694,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" - #: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1831 cmdline/apt-get.cc:1864 -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1912 cmdline/apt-get.cc:2123 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@@ -715,7 -727,7 +727,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:845 cmdline/apt-get.cc:1978 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -749,7 -761,7 +761,7 @@@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1337 cmdline/apt-get.cc:2021 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -758,7 -770,7 +770,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "" @@@ -850,63 -862,45 +862,63 @@@ msgstr " msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1285 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1437 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1356 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1370 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + - #: cmdline/apt-get.cc:1395 ++#: cmdline/apt-get.cc:1422 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + - #: cmdline/apt-get.cc:1398 cmdline/apt-get.cc:1600 ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 +msgid "The following information may help to resolve the situation:" +msgstr "" + - #: cmdline/apt-get.cc:1402 ++#: cmdline/apt-get.cc:1429 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + - #: cmdline/apt-get.cc:1420 ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1519 cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1542 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1572 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1575 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1587 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -914,149 -908,158 +926,154 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1595 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" - #: cmdline/apt-get.cc:1603 -#: cmdline/apt-get.cc:1585 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1634 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1705 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1706 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1726 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1729 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1734 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1799 cmdline/apt-get.cc:1807 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:1907 -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2141 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1981 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1986 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1989 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1995 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2026 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2054 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2066 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2083 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2102 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2118 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2146 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2166 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2270 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2305 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2330 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2344 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2348 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2380 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2421 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1310,7 -1313,7 +1327,8 @@@ msgid "File %s/%s overwrites the one i msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 --#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@@ -2079,27 -2086,18 +2101,27 @@@ msgstr " msgid "extra" msgstr "" - #: apt-pkg/depcache.cc:89 apt-pkg/depcache.cc:118 -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "" - #: apt-pkg/depcache.cc:90 -#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "" - #: apt-pkg/depcache.cc:119 -#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "" - #: apt-pkg/depcache.cc:140 apt-pkg/depcache.cc:159 apt-pkg/depcache.cc:163 ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 +msgid "Reading state information" +msgstr "" + - #: apt-pkg/depcache.cc:179 ++#: apt-pkg/depcache.cc:189 +#, c-format +msgid "Failed to write StateFile %s" +msgstr "" + #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2110,52 -2108,52 +2132,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:191 ++#: apt-pkg/sourcelist.cc:244 #, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2214,12 -2212,17 +2236,17 @@@ msgstr " msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2337,7 -2340,7 +2364,7 @@@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:906 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" @@@ -2348,20 -2351,20 +2375,20 @@@ msgid " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:773 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:809 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:896 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" diff --cc po/bs.po index 806c1204d,e79db9027..2be6feec2 --- a/po/bs.po +++ b/po/bs.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@@ -146,8 -146,8 +146,8 @@@ msgid " %4i %s\n msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -242,7 -254,7 +254,7 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@@ -531,202 -543,223 +543,223 @@@ msgstr " msgid "Failed to rename %s to %s" msgstr "" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ali se ne može instalirati" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ali nije instaliran" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ili" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "" --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr "" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Urađeno" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. PokuÅ¡ajte koristeći -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -734,75 -767,75 +767,75 @@@ " ?] " msgstr "" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Odustani." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Odustajem od instalacije." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "[Instalirano]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -810,79 -843,79 +843,97 @@@ "is only available from another source\n" msgstr "" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1429 ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -890,149 -923,158 +941,154 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "OÅ¡tećeni paketi" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Predloženi paketi:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Preporučeni paketi:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "NeuspjeÅ¡no" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Urađeno" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Podržani moduli:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1285,8 -1327,8 +1341,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" @@@ -1316,9 -1358,9 +1373,9 @@@ msgid "The info and temp directories ne msgstr "" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Čitam spiskove paketa" @@@ -2025,18 -2106,18 +2121,28 @@@ msgstr "opcionalno msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Gradim stablo zavisnosti" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Verzije kandidata" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Stvaranje zavisnosti" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Sastavljam dostupne informacije" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Ne mogu ukloniti %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2047,52 -2128,52 +2153,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otvaram %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:191 ++#: apt-pkg/sourcelist.cc:244 #, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2110,19 -2191,19 +2216,19 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@@ -2146,12 -2232,17 +2257,17 @@@ msgstr " msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2185,82 -2276,82 +2301,82 @@@ msgstr " msgid "No priority (or zero) specified for pin" msgstr "" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@@ -2269,7 -2360,7 +2385,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" @@@ -2280,20 -2371,20 +2396,20 @@@ msgid " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" @@@ -2393,3 -2484,57 +2509,57 @@@ msgstr " #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Otvaram %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Otvaram %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, c-format + msgid "Preparing to configure %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Povezujem se sa %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalirano:" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Otvaram %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Preporučuje" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "" diff --cc po/ca.po index 7fe93910e,a49bc03f9..2578ce741 --- a/po/ca.po +++ b/po/ca.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@@ -149,8 -149,8 +149,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" @@@ -291,7 -307,7 +307,7 @@@ msgstr " " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@@ -618,79 -634,79 +634,79 @@@ msgstr "S'ha trobat un problema treien msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "però està instal·lat %s" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "però s'instal·larà %s" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "però no és instal·lable" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "però és un paquet virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "però no està instal·lat" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "però no serà instal·lat" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " o" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "S'instal·laran els següents paquets NOUS:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "S'ELIMINARAN els següents paquets:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "S'han mantingut els següents paquets:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els següents paquets:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els següents paquets:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Es canviaran els següents paquets mantinguts:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -698,122 -714,146 +714,146 @@@ msgstr " "AVÍS: Els següents paquets essencials seran eliminats.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instal·lar, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstal·lats, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a eliminar i %lu no actualitzats.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instal·lats o eliminats completament.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependències..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " ha fallat." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Fet" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho usant -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "S'ha descartat l'avís d'autenticació.\n" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " + "trencats!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "S'ha produït un error intern, l'ordenació no ha acabat" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + "Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es necessita obtenir %sB/%sB d'arxius.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es necessita obtenir %sB d'arxius.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "No s'ha pogut determinar l'espai lliure en %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -824,28 -864,28 +864,28 @@@ msgstr " "Per a continuar escriviu la frase «%s»\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Avortat." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -853,48 -893,48 +893,48 @@@ msgstr " "No es poden descarregar alguns arxius, potser executant apt-get update o " "intenteu-ho amb --fix-missing." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "S'està avortant la instal·lació." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota: s'està seleccionant %s en comptes de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instal·lat]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -905,50 -945,50 +945,50 @@@ msgstr " "en fa referència. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Tot i que els següents paquets el reemplacen:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquet %s no té candidat d'instal·lació" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -956,25 -996,25 +996,45 @@@ msgstr " "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " "s'han usat els antics." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "La següent informació pot ajudar-vos a resoldre la situació:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++"S'ha produït un error intern, el solucionador de problemes ha trencat coses" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -982,7 -1022,7 +1042,7 @@@ msgstr " "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -994,7 -1034,7 +1054,7 @@@ msgstr " "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1004,109 -1044,119 +1064,115 @@@ msgstr " "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" "un informe d'error en contra d'aquest per a arxivar-lo." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "La següent informació pot ajudar-vos a resoldre la situació:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Paquets trencats" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Paquets suggerits:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Paquets recomanats:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ha fallat" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Fet" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "" + "S'ha produït un error intern, el solucionador de problemes ha trencat coses" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a descarregar" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Ha fallat el procés fill" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1115,7 -1165,7 +1181,7 @@@ msgstr " "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1124,32 -1174,32 +1190,32 @@@ msgstr " "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Mòduls suportats:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1459,8 -1509,8 +1525,9 @@@ msgstr "S'està sobreescrivint el corre msgid "File %s/%s overwrites the one in the package %s" msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@@ -1492,9 -1542,9 +1559,9 @@@ msgstr " "fitxers" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" @@@ -2206,18 -2300,18 +2317,28 @@@ msgstr "opcional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "S'està construint l'arbre de dependències" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versions candidates" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Dependències que genera" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "S'està fusionant la informació disponible" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "No s'ha pogut escriure el fitxer %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2228,52 -2322,52 +2349,52 @@@ msgstr "No es pot analitzar el fitxer d msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" @@@ -2295,14 -2389,14 +2416,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "El tipus de fitxer índex '%s', no està suportat" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2310,7 -2404,7 +2431,7 @@@ msgstr " "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets mantinguts." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets mantinguts que estan " @@@ -2336,12 -2435,20 +2462,20 @@@ msgstr "No s'ha pogut trobar el mètod msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n" + " '%s'\n" + "en la unitat de '%s' i premeu Intro\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament '%s' no està suportat." --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@@ -2377,86 -2484,86 +2511,86 @@@ msgstr "No s'ha entès el pin de tipus msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "La memòria cau té un sistema de versions incompatible" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "S'ha produït un error durant el processament de %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "S'ha produït un error durant el processament de %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "S'ha produït un error durant el processament de %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "S'ha produït un error durant el processament de %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "S'ha produït un error durant el processament de %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "S'ha produït un error durant el processament de %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, heu excedit el nombre de versions de les que aquest APT és capaç. " --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, heu excedit el nombre de dependències de les que aquest APT és capaç." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "S'ha produït un error durant el processament de %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "S'ha produït un error durant el processament de %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@@ -2465,7 -2572,7 +2599,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" @@@ -2479,7 -2586,7 +2613,7 @@@ msgstr " "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2488,7 -2595,7 +2622,7 @@@ msgstr " "No ha estat possible localitzar un fitxer pel paquet %s. Això podria " "significar que haureu d'arreglar aquest paquet manualment." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2496,7 -2603,7 +2630,7 @@@ msgstr " "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Mida diferent" @@@ -2601,62 -2708,59 +2735,59 @@@ msgstr " "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" - #~ msgid "Authentication warning overridden.\n" - #~ msgstr "S'ha descartat l'avís d'autenticació.\n" - - #~ msgid "Internal error, InstallPackages was called with broken packages!" - #~ msgstr "" - #~ "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " - #~ "trencats!" - - #~ msgid "Internal error, Ordering didn't finish" - #~ msgstr "S'ha produït un error intern, l'ordenació no ha acabat" - - #~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" - #~ msgstr "" - #~ "Què estrany... les mides no coincideixen, informeu a apt@packages.debian." - #~ "org" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "S'està obrint %s" - #~ msgid "Couldn't determine free space in %s" - #~ msgstr "No s'ha pogut determinar l'espai lliure en %s" + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "S'està obrint %s" - #~ msgid "Internal error, problem resolver broke stuff" - #~ msgstr "" - #~ "S'ha produït un error intern, el solucionador de problemes ha trencat " - #~ "coses" + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "S'està obrint el fitxer de configuració %s" - #~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." - #~ msgstr "" - #~ "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " - #~ "sortint." + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "S'està connectant amb %s" ++msgstr "" - #~ msgid "" - #~ "Internal error: Good signature, but could not determine key fingerprint?!" - #~ msgstr "" - #~ "Error intern: La signatura és correcta, però no s'ha pogut determinar " - #~ "l'emprempta digital de la clau!" + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instal·lat: " - #~ msgid "At least one invalid signature was encountered." - #~ msgstr "S'ha trobat almenys una signatura invàlida." + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" - #~ msgid "Could not execute " - #~ msgstr "No s'ha pogut executar " + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "S'està obrint %s" - #~ msgid " to verify signature (is gnupg installed?)" - #~ msgstr " per a verificar la signatura (està instal·lat el gnupg?)" + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomana" ++msgstr "" - #~ msgid "Unknown error executing gpgv" - #~ msgstr "S'ha produït un error desconegut en executar el gpgv" + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" - #~ msgid "The following signatures were invalid:\n" - #~ msgstr "Les següents signatures són invàlides:\n" + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" - #~ msgid "" - #~ "The following signatures couldn't be verified because the public key is " - #~ "not available:\n" - #~ msgstr "" - #~ "Les següents signatures no s'han pogut verificar perquè la clau pública " - #~ "no està disponible:\n" + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "La connexió s'ha tancat prematurament" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" diff --cc po/cs.po index 28f683d1a,0b590f885..2ff41d511 --- a/po/cs.po +++ b/po/cs.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@@ -146,8 -146,8 +146,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" @@@ -286,7 -302,7 +302,7 @@@ msgstr " " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Nemohu zapsat do %s" @@@ -613,79 -629,79 +629,79 @@@ msgstr "Problém s odlinkováním %s msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ale není nainstalovaný" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " nebo" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -694,122 -710,144 +710,144 @@@ msgstr " "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalováno, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Opravuji závislosti..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " selhalo." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Nemohu opravit závislosti" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Nemohu minimalizovat sadu pro aktualizaci" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Hotovo" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit `apt-get -f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Instalovat tyto balíky bez ověření [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Vnitřní chyba při přidávání diverze" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potřebuji stáhnout %sB/%sB archívů.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potřebuji stáhnout %sB archívů.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení bude na disku použito dalších %sB.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Na %s nemáte dostatek volného místa" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatek volného místa." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno 'pouze triviální', ovÅ¡em toto není triviální operace." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -820,28 -858,28 +858,28 @@@ msgstr " "Pro pokračování opiÅ¡te frázi '%s'\n" " ?]" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "PřeruÅ¡eno." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -849,47 -887,47 +887,47 @@@ msgstr " "Nemohu stáhnout některé archívy. Možná spusÅ¥te apt-get update nebo zkuste --" "fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Nemohu opravit chybějící balíky." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "PřeruÅ¡uji instalaci." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pozn: Vybírám %s místo %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protože je již nainstalován.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s není nainstalován, nelze tedy odstranit\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovaný:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "[Instalovaný]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -900,49 -938,49 +938,49 @@@ msgstr " "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n" "pouze z jiného zdroje\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta pro instalaci" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání '%s' pro '%s' nebylo nalezeno" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze '%s' pro '%s' nebyla nalezena" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -950,25 -988,25 +988,44 @@@ msgstr " "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " "použity starší verze." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Následující informace vám mohou pomoci vyřeÅ¡it tuto situaci:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Vnitřní chyba, AllUpgrade pokazil věci" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit `apt-get -f install':" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -976,7 -1014,7 +1033,7 @@@ msgstr " "Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo " "navrhněte řeÅ¡ení)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -987,7 -1025,7 +1044,7 @@@ msgstr " "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky jeÅ¡tě nebyly vytvořeny nebo přesunuty z Příchozí fronty." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -997,114 -1035,124 +1054,120 @@@ msgstr " "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Následující informace vám mohou pomoci vyřeÅ¡it tuto situaci:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "PoÅ¡kozené balíky" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Následujcící extra balíky budou instalovány:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Navrhované balíky:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Doporučované balíky:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Selhalo" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Hotovo" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Vnitřní chyba, AllUpgrade pokazil věci" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Stažení některých archívů selhalo." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Synovský proces selhal" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1113,31 -1161,31 +1176,31 @@@ msgstr " "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliÅ¡ nový" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Podporované moduly:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1440,8 -1488,8 +1503,9 @@@ msgstr "Přepsat vyhovující balík be msgid "File %s/%s overwrites the one in the package %s" msgstr "Soubor %s/%s přepisuje ten z balíku %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" @@@ -1471,9 -1519,9 +1535,9 @@@ msgid "The info and temp directories ne msgstr "Adresáře info a temp musí být na stejném souborovém systému" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Čtu seznamy balíků" @@@ -2185,18 -2273,18 +2289,28 @@@ msgstr "volitelný msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Vytvářím strom závislostí" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidátské verze" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generování závislostí" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Slučuji dostupné informace" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Selhal zápis do souboru %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2207,52 -2295,52 +2321,52 @@@ msgstr "Nelze zpracovat soubor %s (1) msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otevírám %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliÅ¡ dlouhý." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" @@@ -2273,13 -2361,13 +2387,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexový typ souboru '%s' není podporován" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archív." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2287,7 -2375,7 +2401,7 @@@ msgstr " "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu." @@@ -2311,12 -2404,20 +2430,20 @@@ msgstr "Ovladač metody %s nemohl být msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuÅ¡těna správně" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Výměna média: Vložte disk nazvaný\n" + " '%s'\n" + "do mechaniky '%s' a stiskněte enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' není podporován" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" @@@ -2351,84 -2452,84 +2478,84 @@@ msgstr "Nerozumím vypíchnutí typu %s msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cache má nekompatibilní systém správy verzí" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Při zpracování %s se objevila chyba (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Při zpracování %s se objevila chyba (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Při zpracování %s se objevila chyba (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Při zpracování %s se objevila chyba (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Při zpracování %s se objevila chyba (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Při zpracování %s se objevila chyba (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, překročili jste počet jmen balíků, které tato APT zvládá zpracovat." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Wow, překročili jste počet závislostí, které tato APT zvládá zpracovat." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba při zpracování %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "NeÅ¡lo vyhodnotit seznam zdrojových balíků %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" @@@ -2437,7 -2538,7 +2564,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" @@@ -2450,7 -2551,7 +2577,7 @@@ msgstr " "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2459,14 -2560,14 +2586,14 @@@ msgstr " "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou naruÅ¡eny. Chybí pole Filename: u balíku %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@@ -2569,3 -2670,57 +2696,57 @@@ msgstr "Zapsal jsem %i záznamů s neso msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Otevírám %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Otevírám %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Otevírám konfigurační soubor %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Připojuji se k %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalovaná verze: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Otevírám %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Doporučuje" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Spojení bylo předčasně ukončeno" diff --cc po/da.po index 44cf0337a,3d5a009ff..01aee4f18 --- a/po/da.po +++ b/po/da.po @@@ -8,8 -8,8 +8,8 @@@ msgid " msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-07 15:28+0100\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-06-23 10:46+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@@ -152,8 -152,8 +152,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat på %s %s\n" @@@ -293,7 -305,7 +305,7 @@@ msgstr " " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@@ -619,80 -631,79 +631,80 @@@ msgstr "Problem under aflænkning af %s msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdøbe %s til %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "men den kan ikke installeres" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "men den er ikke installeret" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " eller" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -700,123 -711,144 +712,144 @@@ msgstr " "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Retter afhængigheder..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " mislykkedes." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhængigheder" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssættet" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Færdig" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhængigheder. Prøv med -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakkers autensitet kunne ikke verificeres!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Autentifikationsadvarsel tilsidesat.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installér disse pakker uden verifikation (y/N)? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "Intern fejl. Sortering blev ikke fuldført" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke læses." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter udpakning vil %sB yderligere diskplads være brugt.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "Kunne ikke bestemme ledig plads i %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, gør som jeg siger!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -826,28 -858,28 +859,28 @@@ msgstr " "For at fortsætte, skal du skrive '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Afbryder." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -855,49 -887,49 +888,49 @@@ msgstr " "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' " "eller prøv med --fix-missing." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understøttes endnu ikke" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Afbryder installationen." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Bemærk, at %s vælges fremfor %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Overspringer %s, da den allerede er installeret og opgradering er " "deaktiveret.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installeret]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Du bør eksplicit vælge en at installere." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -908,49 -940,49 +941,49 @@@ msgstr " "anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n" "kun kan hentes fra andre kilder\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Dog kan følgende pakker erstatte den:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installationskandidat" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven '%s' for '%s' blev ikke fundet" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen '%s' for '%s' blev ikke fundet" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kunne ikke låse listemappen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -958,25 -990,25 +991,44 @@@ msgstr " "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " "bruges i stedet." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Intern fejl. Problemløseren ødelagde noget" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -984,7 -1016,7 +1036,7 @@@ msgstr " "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -995,7 -1027,7 +1047,7 @@@ msgstr " "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1004,105 -1036,114 +1056,110 @@@ msgstr " "Siden du kan bad om en enkelt handling, kan pakken højst sandsynligt slet\n" "ikke installeres og du bør indsende en fejlrapport for denne pakke." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Ødelagte pakker" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Foreslåede pakker:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Anbefalede pakker:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislykkedes" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Færdig" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "Intern fejl. Problemløseren ødelagde noget" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Barneprocessen fejlede" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1110,7 -1151,7 +1167,7 @@@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1119,32 -1160,32 +1176,32 @@@ msgstr " "%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Understøttede moduler:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1453,8 -1494,8 +1510,9 @@@ msgstr "Overskriv pakkematch uden versi msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overskriver filen i pakken %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke læse %s" @@@ -1484,9 -1525,9 +1542,9 @@@ msgid "The info and temp directories ne msgstr "Mapperne info og temp skal ligge i samme filsystem" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Indlæser pakkelisterne" @@@ -1617,7 -1657,11 +1675,12 @@@ msgstr "Forkert cd msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Disk blev ikke fundet." ++msgstr "Fil blev ikke fundet" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fil blev ikke fundet" @@@ -1837,6 -1882,45 +1901,44 @@@ msgstr "Der skete noget underligt unde msgid "Unable to connect to %s %s:" msgstr "Kunne ikke forbinde til %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter." ++msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Stødte på mindst én ugyldig signatur." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Kunne ikke køre " ++msgstr "Kunne ikke opnå låsen %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " for at verificere signaturen (er gnupg installeret?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Ukendt fejl ved kørsel af gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Følgende signaturer var ugyldige:\n" ++msgstr "Følgende yderligere pakker vil blive installeret:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er " -"tilgængelig:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -2200,18 -2280,18 +2298,28 @@@ msgstr "frivillig msgid "extra" msgstr "ekstra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Opbygger afhængighedstræ" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidatversioner" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Afhængighedsgenerering" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Sammenfletter tilgængelighedsoplysninger" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Kunne ikke skrive filen %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2222,52 -2302,52 +2330,52 @@@ msgstr "Kunne ikke tolke pakkefilen %s msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Åbner %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" @@@ -2289,14 -2369,14 +2397,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indeksfiler af typen '%s' understøttes ikke" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2304,7 -2384,7 +2412,7 @@@ msgstr " "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." @@@ -2319,7 -2399,12 +2427,12 @@@ msgstr "Listemappen %spartial mangler. msgid "Archive directory %spartial is missing." msgstr "Arkivmappen %spartial mangler." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Henter fil %li ud af %li (%s tilbage)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Metodedriveren %s blev ikke fundet." @@@ -2329,12 -2414,17 +2442,20 @@@ msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur." ++msgstr "" ++"Medieskift: Indsæt disken med navnet\n" ++" '%s'\n" ++"i drevet '%s' og tryk retur\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understøttes ikke" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@@ -2368,84 -2458,84 +2489,84 @@@ msgstr "Kunne ikke forstå pin-type %s msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" --#: apt-pkg/pkgcachegen.cc:117 -#, c-format ++#: apt-pkg/pkgcachegen.cc:119 +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 -#, c-format ++#: apt-pkg/pkgcachegen.cc:131 +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 -#, c-format ++#: apt-pkg/pkgcachegen.cc:152 +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 -#, c-format ++#: apt-pkg/pkgcachegen.cc:156 +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 -#, c-format ++#: apt-pkg/pkgcachegen.cc:186 +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 -#, c-format ++#: apt-pkg/pkgcachegen.cc:190 +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 -#, c-format ++#: apt-pkg/pkgcachegen.cc:194 +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere." --#: apt-pkg/pkgcachegen.cc:241 -#, c-format ++#: apt-pkg/pkgcachegen.cc:243 +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 -#, c-format ++#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Samler filudbud" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" @@@ -2454,7 -2544,7 +2575,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" @@@ -2467,7 -2557,7 +2588,7 @@@ msgstr " "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2476,13 -2566,13 +2597,13 @@@ msgstr " "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@@ -2585,6 -2675,60 +2706,60 @@@ msgstr "Skrev %i poster med %i ikke-tru msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Klargør %s" ++msgstr "Åbner %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Pakker %s ud" ++msgstr "Åbner %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Gør klar til at sætte %s op" ++msgstr "Åbner konfigurationsfilen %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Sætter %s op" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "Installerede %s" ++msgstr " Installeret: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Gør klar til afinstallation af %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Fjerner %s" ++msgstr "Åbner %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "Fjernede %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Gør klar til at fjerne %s inklusive opsætning" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Fjernede %s inklusive opsætning" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Forbindelsen lukkedes for hurtigt" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukendt leverandør-ID '%s' på linje %u i kildelisten %s" diff --cc po/de.po index e053fee1e,23f79dfe3..0fd07d894 --- a/po/de.po +++ b/po/de.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" @@@ -293,7 -308,7 +308,7 @@@ msgstr " " -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" "tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kann nicht nach %s schreiben" @@@ -627,79 -642,79 +642,79 @@@ msgstr "Problem beim Unlinking von %s msgid "Failed to rename %s to %s" msgstr "Konnte %s nicht in %s umbenennen" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ist aber nicht installierbar" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ist aber nicht installiert" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " oder " --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Die folgenden Pakete werden DEAKTUALISIERT:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Die folgenden gehaltenen Pakete werden verändert:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -708,124 -723,147 +723,147 @@@ msgstr " "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu deaktualisiert, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Abhängigkeit werden korrigiert..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " fehlgeschlagen." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Kann Abhängigkeiten nicht korrigieren" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Fertig" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " -msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " +msgstr "Diese Pakete ohne Überprüfung installieren [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "Interner Fehler, Anordnung beendete nicht" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + "Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie an " + "apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es müssen %sB Archive geholt werden.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "Konnte freien Platz in %s nicht bestimmen" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -836,28 -874,28 +874,28 @@@ msgstr " "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abbruch." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -865,48 -903,48 +903,48 @@@ msgstr " "Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder " "mit »--fix-missing« probieren?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Installation abgebrochen." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Achtung, wähle %s an Stelle von %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installiert]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -917,51 -955,51 +955,51 @@@ msgstr " "Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfügbar ist.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Re-Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release »%s« für »%s« konnte nicht gefunden werden" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -969,27 -1007,27 +1007,47 @@@ msgstr " "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Achtung, wähle %s für reg. Ausdruck »%s«\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -997,7 -1035,7 +1055,7 @@@ msgstr " "Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " "jeglich Pakete (oder geben Sie eine Lösung an)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1009,7 -1047,7 +1067,7 @@@ msgstr " "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1020,110 -1058,119 +1078,114 @@@ msgstr " "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" --"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Kaputte Pakete" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fehlgeschlagen" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Fertig" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB der Quellarchive geholt werden.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "überprüft werden sollen." - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1132,7 -1179,7 +1194,7 @@@ msgstr " "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1141,32 -1188,32 +1203,32 @@@ msgstr " "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Unterstützte Module:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1479,8 -1526,8 +1541,9 @@@ msgstr "Überschreibe Paket-Treffer ohn msgid "File %s/%s overwrites the one in the package %s" msgstr "Datei %s/%s überschreibt die Datei in Paket %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" @@@ -1511,9 -1558,9 +1574,9 @@@ msgstr " "Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" @@@ -2233,18 -2320,18 +2336,28 @@@ msgstr "optional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Abhängigkeitsbaum wird aufgebaut" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Mögliche Versionen" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Führe Information zur Verfügbarkeit zusammen" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Konnte nicht in Datei %s schreiben" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2255,52 -2342,52 +2368,52 @@@ msgstr "Kann Paketdatei %s nicht parse msgid "Unable to parse package file %s (2)" msgstr "Kann Paketdatei %s nicht parsen (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" @@@ -2322,7 -2409,7 +2435,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexdateityp »%s« wird nicht unterstützt" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2330,7 -2417,7 +2443,7 @@@ msgstr " "Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür " "finden." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2338,7 -2425,7 +2451,7 @@@ msgstr " "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies " "könnte durch gehaltene Pakete hervorgerufen worden sein." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete." @@@ -2362,12 -2454,20 +2480,20 @@@ msgstr "Der Treiber für Methode %s kon msgid "Method %s did not start correctly" msgstr "Methode %s hat nicht korrekt gestartet" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Medienwechsel: Bitte legen Sie Medium mit den Name\n" + " »%s«\n" + "in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem »%s« wird nicht unterstützt" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" @@@ -2406,88 -2506,88 +2532,88 @@@ msgstr "Konnte Stecknadeltyp (»pin typ msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben " "kann." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT " "handhaben kann." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen." --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Sammle Datei-Empfehlungen ein" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Sichern des Quellcaches" @@@ -2496,7 -2596,7 +2622,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" @@@ -2509,7 -2609,7 +2635,7 @@@ msgstr " "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2518,14 -2618,14 +2644,14 @@@ msgstr " "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@@ -2630,6 -2730,60 +2756,60 @@@ msgstr " "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " "geschrieben.\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s wird geöffnet" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s wird geöffnet" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Öffne Konfigurationsdatei %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Verbinde mit %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Installiert:" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s wird geöffnet" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Empfiehlt" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Verbindung zu früh beendet" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s" diff --cc po/el.po index 4a0cfe84d,e10c02d95..5f044fd48 --- a/po/el.po +++ b/po/el.po @@@ -16,7 -16,7 +16,7 @@@ msgid " msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team \n" @@@ -160,8 -160,8 +160,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" @@@ -303,7 -319,7 +319,7 @@@ msgstr " " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@@ -633,79 -649,79 +649,79 @@@ msgstr "Πρόβλημα κατά τηΠmsgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " η" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -714,125 -730,147 +730,147 @@@ msgstr " "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Διόρθωση εξαρτήσεων..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " απέτυχε." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Αδύνατη η διόρθωση των εξαρτήσεων" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Ετοιμο" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -843,28 -881,28 +881,28 @@@ msgstr " "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Εγκατάλειψη." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -872,49 -910,49 +910,49 @@@ msgstr " "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Εγκατεστημένα]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -926,51 -964,51 +964,51 @@@ msgstr " "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο " "από άλλη πηγή\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " "του\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το%s δεν βρέθηκε" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -978,25 -1016,25 +1016,44 @@@ msgstr " "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " "στη θέση τους." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1004,7 -1042,7 +1061,7 @@@ msgstr " "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1016,7 -1054,7 +1073,7 @@@ msgstr " "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1026,108 -1064,118 +1083,114 @@@ msgstr " "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Απέτυχε" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Ετοιμο" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1135,7 -1183,7 +1198,7 @@@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1144,32 -1192,32 +1207,32 @@@ msgstr " "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1478,8 -1526,8 +1541,9 @@@ msgstr "Αντικατάσταση πα msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" @@@ -1509,9 -1557,9 +1573,9 @@@ msgid "The info and temp directories ne msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" @@@ -2229,18 -2317,18 +2333,28 @@@ msgstr "προαιρετικό msgid "extra" msgstr "επιπλέον" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Κατασκευή Δένδρου Εξαρτήσεων" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Υποψήφιες Εκδόσεις" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Παραγωγή Εξαρτήσεων" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Αποτυχία εγγραφής στο αρχείο %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2251,52 -2339,52 +2365,52 @@@ msgstr "Αδύνατη η ανάλυσΠmsgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" @@@ -2318,7 -2406,7 +2432,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2326,7 -2414,7 +2440,7 @@@ msgstr " "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2334,7 -2422,7 +2448,7 @@@ msgstr " "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." @@@ -2358,12 -2451,20 +2477,20 @@@ msgstr "Ο οδηγός μεθόδου msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Αλλαγή Μέσου: Παρακαλώ εισάγετε το δίσκο με ετικέτα\n" + " '%s'\n" + "στη συσκευή '%s' και πιέστε enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" @@@ -2400,85 -2501,85 +2527,85 @@@ msgid "No priority (or zero) specified msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το " "APT." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" @@@ -2487,7 -2588,7 +2614,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" @@@ -2500,7 -2601,7 +2627,7 @@@ msgstr " "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2509,7 -2610,7 +2636,7 @@@ msgstr " "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2517,7 -2618,7 +2644,7 @@@ msgstr " "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@@ -2619,3 -2720,57 +2746,57 @@@ msgstr "Εγιναν %i ÎµÎ³Î³ÏÎ±Ï†Î­Ï #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Άνοιγμα του %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Άνοιγμα του %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Σύνδεση στο %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Εγκατεστημένα: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Άνοιγμα του %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Συστήνει" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Η σύνδεση έκλεισε πρόωρα" diff --cc po/en_GB.po index 574a296d3,a0d593d31..59a6099bf --- a/po/en_GB.po +++ b/po/en_GB.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@@ -146,8 -146,8 +146,8 @@@ msgid " %4i %s\n msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -230,7 -246,7 +246,7 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "" @@@ -558,200 -574,221 +574,221 @@@ msgstr " msgid "Failed to rename %s to %s" msgstr "" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr "" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "" --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "" --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr "" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr "" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "" --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -762,74 -799,74 +799,74 @@@ msgstr " "To continue type in the phrase ‘%s’\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "" - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, fuzzy, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s for regex ‘%s’\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -837,73 -874,73 +874,91 @@@ "is only available from another source\n" msgstr "" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1429 ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -911,7 -948,7 +966,7 @@@ msgstr " "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -919,149 -956,158 +974,154 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1317,8 -1363,8 +1377,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@@ -1348,9 -1394,9 +1409,9 @@@ msgid "The info and temp directories ne msgstr "" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "" @@@ -2057,18 -2141,18 +2156,27 @@@ msgstr " msgid "extra" msgstr "" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++msgid "Reading state information" ++msgstr "" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Could not resolve ‘%s’" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2079,52 -2163,52 +2187,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:191 ++#: apt-pkg/sourcelist.cc:244 #, fuzzy, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Type ‘%s’ is not known in on line %u in source list %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2142,19 -2226,19 +2250,19 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@@ -2178,12 -2267,20 +2291,20 @@@ msgstr " msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Media Change: Please insert the disc labelled\n" + " ‘%s’\n" + "in the drive ‘%s’ and press enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2217,82 -2314,82 +2338,82 @@@ msgstr " msgid "No priority (or zero) specified for pin" msgstr "" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@@ -2301,7 -2398,7 +2422,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" @@@ -2312,20 -2409,20 +2433,20 @@@ msgid " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" diff --cc po/es.po index e046e15c2,89233647c..675264846 --- a/po/es.po +++ b/po/es.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: Spanish \n" @@@ -150,8 -150,8 +150,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" @@@ -295,7 -308,7 +308,7 @@@ msgstr " " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" "cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@@ -627,79 -640,79 +640,79 @@@ msgstr "Hay problemas desligando %s msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "pero no es instalable" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "pero no está instalado" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " o" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -708,123 -721,146 +721,146 @@@ msgstr " "AVISO: Se van a eliminar los siguientes paquetes esenciales\n" "¡Esto NO debe hacerse a menos que sepa exactamente lo que está haciendo!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " falló." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualización" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Listo" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "¿Instalar estos paquetes sin verificación [s/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utilizó -y sin --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "Error interno, InstallPackages fue llamado con un paquete roto!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove está deshabilitado." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "Error interno, no terminó el ordenamiento" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + "Que raro.. Los tamaños no concuerdan, mande un correo a \n" + "apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Se utilizarán %sB de espacio de disco adicional después de desempaquetar.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de desempaquetar.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "No pude determinar el espacio libre en %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especificó Trivial Only pero ésta no es una operación trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Sí, ¡haga lo que le digo!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -835,28 -871,28 +871,28 @@@ msgstr " "Para continuar escriba la frase '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abortado." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -864,47 -900,47 +900,47 @@@ msgstr " "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar\n" "apt-get update o deba intentarlo de nuevo con --fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no están soportados --fix-missing e intercambio de medio" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abortando la instalación." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s en lugar de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s no esta instalado, no se eliminará\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalado]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explícitamente uno para instalar." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -915,49 -951,49 +951,49 @@@ msgstr " "a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n" "encuentra disponible desde alguna otra fuente\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s no tiene candidato para su instalación" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya está en su versión más reciente.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontró la Distribución '%s' para '%s'" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontró la versión '%s' para '%s'" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versión seleccionada %s (%s) para %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -965,25 -1001,25 +1001,46 @@@ msgstr " "Algunos archivos de índice no se han podido descargar, se han ignorado,\n" "o se ha utilizado unos antiguos en su lugar." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "La siguiente información puede ayudar a resolver la situación:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++"Error interno, el sistema de solución de problemas rompió\n" ++"algunas cosas" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresión regular '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -991,7 -1027,7 +1048,7 @@@ msgstr " "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solución)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1003,7 -1039,7 +1060,7 @@@ msgstr " "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1013,107 -1049,118 +1070,114 @@@ msgstr " "paquete simplemente no sea instalable y debería de rellenar un informe de\n" "error contra ese paquete." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "La siguiente información puede ayudar a resolver la situación:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Paquetes rotos" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Paquetes recomendados" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falló" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Listo" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "" + "Error interno, el sistema de solución de problemas rompió\n" + "algunas cosas" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento '%s'.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción '%s'.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Falló el proceso hijo" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construcción" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1122,7 -1169,7 +1186,7 @@@ msgstr " "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1131,32 -1178,32 +1195,32 @@@ msgstr " "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n" "disponible del paquete %s satisface los requisitos de versión" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Módulos soportados:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1469,8 -1516,8 +1533,9 @@@ msgstr "Sobreescribiendo concordancia d msgid "File %s/%s overwrites the one in the package %s" msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@@ -1501,9 -1548,9 +1566,9 @@@ msgstr " "Los directorios info y temp deben de estar en el mismo sistema de archivos" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" @@@ -2218,18 -2305,18 +2323,28 @@@ msgstr "opcional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Creando árbol de dependencias" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versiones candidatas" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generación de dependencias" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Fusionando información disponible" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Falló el cierre del archivo %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2240,52 -2327,52 +2355,52 @@@ msgstr "No se pudo tratar el archivo d msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en lista de fuentes %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en lista de fuentes %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en lista de fuentes %s (dist absoluta)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abriendo %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en lista de fuentes %s (tipo)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tipo '%s' desconocido en la línea %u de lista de fuentes %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)" @@@ -2307,7 -2394,7 +2422,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "No se da soporte para el tipo de archivo de índice '%s'" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2315,7 -2402,7 +2430,7 @@@ msgstr " "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "éste." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2323,7 -2410,7 +2438,7 @@@ msgstr " "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido " "causado por paquetes retenidos." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes\n" @@@ -2349,12 -2441,20 +2469,20 @@@ msgstr "No se pudo encontrar el método msgid "Method %s did not start correctly" msgstr "El método %s no se inició correctamente" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Cambio de medio: Por favor inserte el disco etiquetado\n" + " '%s'\n" + "en la unidad '%s' y presione Intro\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no está soportado" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" @@@ -2391,87 -2491,87 +2519,87 @@@ msgstr "No se entiende el pin tipo %s msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "La caché tiene una versión incompatible de sistema de versiones" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocurrió un error mientras se procesaba %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocurrió un error mientras se procesaba %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocurrió un error mientras se procesaba %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vaya, excedió el número de nombres de paquetes que este APT es capaz de " "manejar." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vaya, excedió el número de dependencias que este APT es capaz de manejar." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocurrió un error mientras procesaba %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocurrió un error mientras procesaba %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontró el\n" "paquete %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" @@@ -2480,7 -2580,7 +2608,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "falló el cambio de nombre, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" @@@ -2494,7 -2594,7 +2622,7 @@@ msgstr " "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2503,7 -2603,7 +2631,7 @@@ msgstr " "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2511,7 -2611,7 +2639,7 @@@ msgstr " "Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "El tamaño difiere" @@@ -2615,6 -2715,60 +2743,60 @@@ msgid "Wrote %i records with %i missin msgstr "" "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Hay problemas abriendo %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Abriendo %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Abriendo fichero de configuración %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Conectando a %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalados: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Abriendo %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomienda" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "La conexión se cerró prematuramente" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID del fabricante '%s' desconocido en la línea %u de la lista de\n" diff --cc po/eu.po index 590e916f8,7310e029d..c7817aa95 --- a/po/eu.po +++ b/po/eu.po @@@ -4,12 -4,13 +4,12 @@@ # msgid "" msgstr "" -"Project-Id-Version: apt_po_eu\n" +"Project-Id-Version: apt-eu\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-07 22:37+0100\n" -"Last-Translator: Piarres Beobide \n" -"Language-Team: librezale.org \n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-04-20 20:05+0200\n" +"Last-Translator: Hizkuntza Politikarako Sailburuordetza \n" +"Language-Team: Basque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@@ -151,8 -152,8 +151,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s) konpilatua: %s %s\n" @@@ -230,6 -231,19 +230,21 @@@ msgstr " " -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" -"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan" + + #: cmdline/apt-cdrom.cc:93 ++#, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "Mesedez sa diska bat gailuan eta enter sakatu" ++msgstr "" ++"Euskarri-aldaketa: sartu '%s'\n" ++"diskoa '%s' unitatean, eta sakatu Sartu\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu." ++msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Parekatu gabeko argumentuak" @@@ -291,7 -305,7 +306,7 @@@ msgstr " " -c=? Irakurri konfigurazio-fitxategi hau\n" " -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@@ -616,80 -630,79 +631,80 @@@ msgstr "Arazoa %s desestekatzean msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio-errorea - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "baina ez da instalagarria" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "baina ez dago instalatuta" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " edo" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -697,123 -710,146 +712,145 @@@ msgstr " "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " : huts egin du." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Ezin da bertsio-berritzeko multzoa minimizatu" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Eginda" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Egiaztapen abisua gainidazten.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" ++msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Barne errorea, ez da ordenatzeaz amaitu" ++msgstr "Barne errorea desbideratze bat gehitzean" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga-direktorioa blokeatu" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Ezin izan da iturburu-zerrenda irakurri." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" -"Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " -"berri emanez (ingelesez)" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Ezin da %s(e)n duzun leku librea atzeman." ++msgstr "Ez daukazu nahikoa leku libre %s(e)n." + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -823,28 -859,28 +860,28 @@@ msgstr " "Jarratzeko, idatzi '%s' esaldia\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abortatu." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -852,47 -888,47 +889,47 @@@ msgstr " "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abortatu instalazioa." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalatuta]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -903,49 -939,49 +940,49 @@@ msgstr " "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -953,25 -989,25 +990,44 @@@ msgstr " "Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Informazio honek arazoa konpontzen lagun dezake:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Barne-errorea, AllUpgrade-k zerbait hautsi du" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -979,7 -1015,7 +1035,7 @@@ msgstr " "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -991,7 -1027,7 +1047,7 @@@ msgstr " "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1000,107 -1036,116 +1056,113 @@@ msgstr " "Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n" "izango, eta pakete horren errorearen berri ematea komeni da." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Informazio honek arazoa konpontzen lagun dezake:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Hautsitako paketeak" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Huts egin du" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Eginda" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" ++msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1108,7 -1153,7 +1170,7 @@@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1117,32 -1162,32 +1179,32 @@@ msgstr " "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Onartutako Moduluak:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1448,8 -1493,8 +1510,9 @@@ msgstr "Gainidatzi pakete-konkordantzi msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@@ -1479,9 -1524,9 +1542,9 @@@ msgid "The info and temp directories ne msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" @@@ -1606,12 -1651,17 +1669,17 @@@ msgstr " msgid "Wrong CD-ROM" msgstr "CD okerra" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" -"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da." +msgstr "Ezin izan da CDROMa %s(e)n muntatu; beharbada erabiltzen ariko da." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Ez da diska aurkitu" ++msgstr "Ez da fitxategia aurkitu" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Ez da fitxategia aurkitu" @@@ -1835,6 -1886,44 +1904,44 @@@ msgstr "Zerbait arraroa pasatu da '%s:% msgid "Unable to connect to %s %s:" msgstr "Ezin da konektatu -> %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten." ++msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" ++msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Beintza sinadura baliogabe bat aurkitu da." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Ezin izan da %s exekutatu" ++msgstr "Ezin izan da %s blokeoa hartu" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " sinadura egiaztatzeko (gnupg instalaturik al dago?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Errore ezezaguna gpgv exekutatzean" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Ondorengo sinadurak baliogabeak dira:\n" ++msgstr "Ondorengo pakete gehigarriak instalatuko dira:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " -"eskuragarri:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -2201,18 -2286,18 +2304,28 @@@ msgstr "aukerakoa msgid "extra" msgstr "estra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Dependentzia zuhaitza eraikitzen" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Hautagaien bertsioak" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Dependentzi Sormena" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Eskuragarrien datuak biltzen" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Ezin izan da %s fitxategian idatzi" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2223,52 -2308,52 +2336,52 @@@ msgstr "Ezin da %s pakete-fitxategia an msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete-fitxategia analizatu (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI analisia)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s irekitzen" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "'%1$s' mota ez da ezagutzen %3$s iturburu-zerrendako %2$u lerroan" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)" @@@ -2290,14 -2375,14 +2403,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "'%s' motako indize-fitxategirik ez da onartzen" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2305,7 -2390,7 +2418,7 @@@ msgstr " "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." @@@ -2319,7 -2404,12 +2432,12 @@@ msgstr "%spartial zerrenda-direktorioa msgid "Archive directory %spartial is missing." msgstr "%spartial artxibo-direktorioa falta da." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu." @@@ -2329,12 -2419,17 +2447,19 @@@ msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" ++msgstr "" ++"Euskarri-aldaketa: sartu '%s'\n" ++"diskoa '%s' unitatean, eta sakatu Sartu\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete-sistema ez da onartzen" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" @@@ -2368,82 -2463,82 +2493,82 @@@ msgstr "Ez da ulertu %s orratz-mota (pi msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cachearen bertsio-sistema ez da bateragarria" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Errorea gertatu da %s prozesatzean (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Fitxategi-erreferentziak biltzen" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu-cachea gordetzean" @@@ -2452,7 -2547,7 +2577,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" @@@ -2465,7 -2560,7 +2590,7 @@@ msgstr " "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2474,7 -2569,7 +2599,7 @@@ msgstr " "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2482,16 -2577,16 +2607,16 @@@ msgstr " "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamaina ez dator bat" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "%s saltzaile blokeak ez du egiaztapen markarik" +msgstr "%s saltzaile blokeak ez du egiatzpen markarik" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2586,202 -2681,56 +2711,245 @@@ msgid "Wrote %i records with %i missin msgstr "" "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "%s prestatzen" ++msgstr "%s irekitzen" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s irekitzen" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "%s konfiguratzeko prestatzen" ++msgstr "%s konfigurazio-fitxategia irekitzen" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "%s konfiguratzen" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "%s Instalatuta" ++msgstr " Instalatuta: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "%s kentzeko prestatzen" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "%s kentzen" ++msgstr "%s irekitzen" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "%s kendurik" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "%s konfigurazioaz ezabatzeko prestatzen" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "%s konfigurazioaz kentzen" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Konexioa behar baino lehenago itxi da" ++ +#~ msgid "Total Package Names : " +#~ msgstr "Pakete-izenak guztira: " + +#~ msgid " Normal Packages: " +#~ msgstr " Pakete normalak: " + +#~ msgid " Pure Virtual Packages: " +#~ msgstr " Pakete birtual puruak: " + +#~ msgid " Single Virtual Packages: " +#~ msgstr " Pakete birtual soilak: " + +#~ msgid " Mixed Virtual Packages: " +#~ msgstr " Pakete birtual nahasiak: " + +#~ msgid "Total Distinct Versions: " +#~ msgstr "Bertsio desberdinak guztira: " + +#~ msgid "Total Dependencies: " +#~ msgstr "Mendekotasunak guztira: " + +#~ msgid "Total Ver/File relations: " +#~ msgstr "Bertsio/fitxategi erlazioak guztira: " + +#~ msgid "Total Provides Mappings: " +#~ msgstr "Hornidura-mapatzeak guztira: " + +#~ msgid "Total Globbed Strings: " +#~ msgstr "Globalizatutako kateak guztira: " + +#~ msgid "Total Dependency Version space: " +#~ msgstr "Mendekotasun-bertsioen lekua guztira: " + +#~ msgid "Total Slack space: " +#~ msgstr "Slack lekua guztira: " + +#~ msgid "Total Space Accounted for: " +#~ msgstr "Hartutako lekua guztira: " + +#~ msgid "Package Files:" +#~ msgstr "Pakete-fitxategiak:" + +#~ msgid "Pinned Packages:" +#~ msgstr "Orratzdun paketeak (pin):" + +#~ msgid " Package Pin: " +#~ msgstr " Pakete-orratza (pin): " + +#~ msgid " Version Table:" +#~ msgstr " Bertsio-taula:" + +#~ msgid "Error Processing directory %s" +#~ msgstr "Errorea %s direktorioa prozesatzean" + +#~ msgid "Error Processing Contents %s" +#~ msgstr "Errorea %s edukia prozesatzean" + +#~ msgid "Unknown Compresison Algorithm '%s'" +#~ msgstr "Konpresio-algoritmo ezezaguna: '%s'" + +#~ msgid "Compress Child" +#~ msgstr "Konprimitu umea" + +#~ msgid "Internal Error, Failed to create %s" +#~ msgstr "Barne-errorea. Ezin izan da %s sortu" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Paketeak kendu egin behar dira, baina Kentzeko aukera desgaituta dago." + +#~ msgid "Do you want to continue? [Y/n] " +#~ msgstr "Jarraitu nahi duzu? [B/e] " + +#~ msgid "Aborting Install." +#~ msgstr "Instalazioa abortatzen." + - #~ msgid "Internal Error, AllUpgrade broke stuff" - #~ msgstr "Barne-errorea, AllUpgrade-k zerbait hautsi du" - +#~ msgid "Calculating Upgrade... " +#~ msgstr "Bertsio-berritzea kalkulatzen... " + +#~ msgid "Fetch Source %s\n" +#~ msgstr "Lortu %s iturburua\n" + +#~ msgid "Supported Modules:" +#~ msgstr "Onartutako moduluak:" + - #~ msgid "" - #~ "Media Change: Please insert the disc labeled\n" - #~ " '%s'\n" - #~ "in the drive '%s' and press enter\n" - #~ msgstr "" - #~ "Euskarri-aldaketa: sartu '%s'\n" - #~ "diskoa '%s' unitatean, eta sakatu Sartu\n" - +#~ msgid "Merging Available information" +#~ msgstr "Informazio erabilgarria batzen" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "Tar Checksum-ek huts egin du; artxiboa hondatuta dago" + +#~ msgid "Internal Error in AddDiversion" +#~ msgstr "Barne-errorea AddDiversion-en" + +#~ msgid "Reading Package Lists" +#~ msgstr "Pakete-zerrendak irakurtzen" + +#~ msgid "Internal Error getting a Package Name" +#~ msgstr "Barne-errorea pakete-izen bat eskuratzean" + +#~ msgid "Reading File Listing" +#~ msgstr "Fitxategi-zerrenda irakurtzen" + +#~ msgid "Internal Error getting a Node" +#~ msgstr "Barne-errorea nodo bat eskuratzean" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Barne-errorea desbideratze bat gehitzean" + +#~ msgid "Reading File List" +#~ msgstr "Fitxategi-zerrenda irakurtzen" + +#~ msgid "Failed to find a Package: Header, offset %lu" +#~ msgstr "Ezin izan da aurkitu Paketea: Goiburua, desplazamendua %lu" + +#~ msgid "Internal Error, could not locate member %s" +#~ msgstr "Barne-errorea; ezin izan da %s kidea lokalizatu" + +#~ msgid "Internal Error, could not locate member" +#~ msgstr "Barne-errorea; ezin izan da kidea lokalizatu" + +#~ msgid "Unparsible control file" +#~ msgstr "Kontrol-fitxategi analizaezina" + +#~ msgid "" +#~ "Please use apt-cdrom to make this CD recognized by APT. apt-get update " +#~ "cannot be used to add new CDs" +#~ msgstr "" +#~ "Erabili apt-cdrom, CD hau APTk identifika dezan. apt-get eguneratzea ezin " +#~ "da erabili CD berriak gehitzeko" + +#~ msgid "Wrong CD" +#~ msgstr "CD okerra" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Zerbitzariak gure konexioa ezetsi du, eta hau esan du: %s" + +#~ msgid "Write Error" +#~ msgstr "Idazketa-errorea" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Http zerbitzariak erantzun-goiburu baliogabe bat bidali du" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Http zerbitzariak Content-Length goiburu baliogabe bat bidali du" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Http zerbitzariak Content-Range goiburu baliogabe bat bidali du" + +#~ msgid "This http server has broken range support" +#~ msgstr "Http zerbitzari honek barruti-onarpena hautsita dauka" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "Errorea zerbitzaritik irakurtzean: Urruneko aldeak konexioa itxi du" + +#~ msgid "Bad header Data" +#~ msgstr "Okerreko goiburu-datuak" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Sintaxi-errorea, %s:%u: Etiketa gaizki osatuta" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "%s(r)en zain egon da, baina ez zegoen hor" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "APT honek ez du onartzen '%s' bertsio-sistema" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Mendekotasunen zuhaitza eraikitzen" + +#~ msgid "Candidate Versions" +#~ msgstr "Hautagai dauden bertsioak" + +#~ msgid "Dependency Generation" +#~ msgstr "Mendekotasunak sortzea" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist absolutua)" + +#~ msgid "Vendor block %s is invalid" +#~ msgstr "%s hornitzaile-blokea ez da baliozkoa" + +#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" +#~ msgstr "" +#~ "'%1$s' hornitzaile-id ezezaguna %3$s iturburu-zerrendako %2$u lerroan" + +#~ msgid "File Not Found" +#~ msgstr "Ez da fitxategia aurkitu" diff --cc po/fi.po index 04cc6473c,fa0102ec1..dbc6587a4 --- a/po/fi.po +++ b/po/fi.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@@ -149,8 -149,8 +149,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" @@@ -289,7 -305,7 +305,7 @@@ msgstr " " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@@ -619,79 -635,79 +635,79 @@@ msgstr "Ilmeni pulmia poistettaessa tie msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "K" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "mutta ei ole asennettu" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " tai" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -700,123 -716,145 +716,145 @@@ msgstr " "VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " ei onnistunut." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Päivitysjoukon minimointi ei onnistu" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Valmis" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -827,28 -865,28 +865,28 @@@ msgstr " "Jatka kirjoittamalla \"%s\"\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Keskeytä." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -856,47 -894,47 +894,47 @@@ msgstr " "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\"auttaa tai " "kokeile --fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Asennus keskeytetään." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Huomautus, valitaan %s eikä %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Asennettu]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Yksi pitää valita asennettavaksi." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -907,49 -945,49 +945,49 @@@ msgstr " "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lähteestä\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -957,25 -995,25 +995,44 @@@ msgstr " "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "käytetty vanhoja. " - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -983,7 -1021,7 +1040,7 @@@ msgstr " "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -994,7 -1032,7 +1051,7 @@@ msgstr " "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1004,106 -1042,116 +1061,112 @@@ msgstr " "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Rikkinäiset paketit" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Suositellut paketit:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ei onnistunut" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Valmis" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1111,7 -1159,7 +1174,7 @@@ msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1120,32 -1168,32 +1183,32 @@@ msgstr " "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Tuetut moduulit:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1451,8 -1499,8 +1514,9 @@@ msgstr "Päälle kirjoitettava paketti msgid "File %s/%s overwrites the one in the package %s" msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@@ -1482,9 -1530,9 +1546,9 @@@ msgid "The info and temp directories ne msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" @@@ -2195,18 -2283,18 +2299,28 @@@ msgstr "valinnainen msgid "extra" msgstr "ylimääräinen" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Muodostetaan riippuvuussuhteiden puu" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Mahdolliset versiot" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Luodaan riippuvuudet" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Yhdistetään saatavuustiedot" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Tiedoston %s kirjoittaminen ei onnistunut" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2217,52 -2305,52 +2331,52 @@@ msgstr "Pakettitiedostoa %s (1) ei voi msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Avataan %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" @@@ -2283,13 -2371,13 +2397,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2297,7 -2385,7 +2411,7 @@@ msgstr " "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." @@@ -2321,12 -2414,20 +2440,20 @@@ msgstr "Menetelmän ajuria %s ei löyty msgid "Method %s did not start correctly" msgstr "Menetelmä %s ei käynnistynyt oikein" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Taltion vaihto: Pistä levy \n" + "\"%s\"\n" + "asemaan \"%s\" ja paina Enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" @@@ -2361,83 -2462,83 +2488,83 @@@ msgstr "Tunnistetyyppi %s on tuntematon msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" @@@ -2446,7 -2547,7 +2573,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" @@@ -2459,7 -2560,7 +2586,7 @@@ msgstr " "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2468,7 -2569,7 +2595,7 @@@ msgstr " "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2476,7 -2577,7 +2603,7 @@@ msgstr " "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Koko ei täsmää" @@@ -2583,6 -2684,60 +2710,60 @@@ msgstr " "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " "tiedostoa\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Avataan %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Avataan %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Avataan asetustiedosto %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Avataan yhteys %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Asennettu: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Avataan %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Suosittelut" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Yhteys katkesi ennenaikaisesti" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "Tuntematon toimittajan tunniste \"%s\" rivillä %u lähdeluettelossa %s" diff --cc po/fr.po index 26323dd75,f14a10b96..ced13aa47 --- a/po/fr.po +++ b/po/fr.po @@@ -6,10 -6,10 +6,10 @@@ # msgid "" msgstr "" -"Project-Id-Version: fr\n" +"Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-01 18:16+0100\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-07-28 20:52+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@@ -150,8 -150,8 +150,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pour %s %s est compilé le %s %s\n" @@@ -233,6 -233,22 +233,22 @@@ msgstr " "Regardez les pages de manuel de apt-cache(8) et apt.conf(5) pour plus\n" "d'informations.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" -"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" + + #: cmdline/apt-cdrom.cc:93 ++#, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" -"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" ++"Changement de support : veuillez insérer le disque\n" ++"« %s »\n" ++"dans le lecteur « %s » et appuyez sur la touche Entrée\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" -"Veuillez répéter cette opération pour tous les disques de votre jeu de " -"cédéroms." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Les arguments ne sont pas en parité" @@@ -294,7 -310,7 +310,7 @@@ msgstr " " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'écrire sur %s" @@@ -623,79 -641,79 +641,79 @@@ msgstr "Problème en déliant %s msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "O" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "mais il n'est pas installable" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "mais il n'est pas installé" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ou" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -704,114 -722,139 +722,138 @@@ msgstr " "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Correction des dépendances..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " a échoué." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dépendances" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis à jour" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Fait" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." +msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Avertissement d'authentification ignoré.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " -msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " +msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu être authentifiés" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problèmes et -y a été employé sans --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." ++msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." - msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée." + msgstr "" + "Les paquets doivent être enlevés mais la désinstallation est désactivée." + -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Erreur interne. Le tri a été interrompu." ++msgstr "Erreur interne en ajoutant une déviation" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" -"Étrangement, les tailles ne correspondent pas. Veuillez le signaler par " -"courriel à apt@packages.debian.org." + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est nécessaire de prendre %so dans les archives.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" - msgstr "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n" + msgstr "" + "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Impossible de déterminer l'espace disponible sur %s" ++msgstr "Pas assez d'espace disponible sur %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " @@@ -819,11 -862,11 +861,11 @@@ # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" -msgstr "Oui, faites ce que je vous dis !" +msgstr "Oui, faites ce que je vous dis !" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -834,28 -877,28 +876,28 @@@ msgstr " "Pour continuer, tapez la phrase « %s »\n" " ?]" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Annulation." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " -msgstr "Souhaitez-vous continuer [O/n] ? " +msgstr "Souhaitez-vous continuer [O/n] ? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -863,47 -906,48 +905,48 @@@ msgstr " "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" "get update ou essayer avec --fix-missing ?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" - msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." + msgstr "" + "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Annulation de l'installation." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, sélection de %s au lieu de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par :\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installé]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement sélectionner un paquet à installer." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -915,49 -959,50 +958,50 @@@ msgstr " "devenu obsolète\n" "ou qu'il n'est disponible que sur une autre source\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent :" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" - msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" + msgstr "" + "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est déjà la plus récente version disponible.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version « %s » de « %s » n'a pu être trouvée" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas d'argument" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le répertoire de liste" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -965,25 -1010,26 +1009,45 @@@ msgstr " "Le téléchargement de quelques fichiers d'index a échoué, ils ont été " "ignorés, ou les anciens ont été utilisés à la place." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "L'information suivante devrait vous aider à résoudre la situation : " ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Erreur interne, AllUpgrade a cassé le boulot !" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" - msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" + msgstr "" + "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -991,7 -1037,7 +1055,7 @@@ msgstr " "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1003,7 -1049,7 +1067,7 @@@ msgstr " "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1012,107 -1058,118 +1076,113 @@@ msgstr " "Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "L'information suivante devrait vous aider à résoudre la situation : " -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Paquets défectueux" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Paquets suggérés :" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Paquets recommandés :" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Échec" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Fait" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "" -"Erreur interne, la tentative de résolution du problème a cassé certaines " -"parties" ++msgstr "Erreur interne, AllUpgrade a cassé le boulot !" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Échec du processus fils" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1121,7 -1178,7 +1191,7 @@@ msgstr " "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1130,32 -1187,33 +1200,33 @@@ msgstr " "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "du paquet %s ne peut satisfaire à la version requise" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." - msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." + msgstr "" + "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Modules reconnus :" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1466,8 -1525,8 +1538,9 @@@ msgstr "Écrase la correspondance de paq msgid "File %s/%s overwrites the one in the package %s" msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" @@@ -1499,9 -1558,9 +1572,9 @@@ msgstr " "fichiers" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Lecture des listes de paquets" @@@ -1589,7 -1648,8 +1662,8 @@@ msgstr "Ce n'est pas une archive DEB va #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" - msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" + msgstr "" -"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" ++"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" #: apt-inst/deb/debfile.cc:112 #, c-format @@@ -1621,18 -1681,22 +1695,23 @@@ msgstr " "Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre " "APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "Mauvais cédérom" +msgstr "Mauvais CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Impossible de démonter le cédérom dans %s, il doit toujours être en cours " "d'utilisation." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Disque non trouvé." ++msgstr "Fichier non trouvé" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fichier non trouvé" @@@ -1854,6 -1921,47 +1936,44 @@@ msgstr " msgid "Unable to connect to %s %s:" msgstr "Impossible de se connecter à %s %s :" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" -"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Erreur interne : signature correcte, mais il est impossible de déterminer " -"l'empreinte de la clé." + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Au moins une signature non valable a été rencontrée." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Impossible d'exécuter " ++msgstr "Impossible de verrouiller %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr "pour contrôler la signature (veuillez vérifier si gnupg est installé)." ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Erreur inconnue à l'exécution de gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Les signatures suivantes ne sont pas valables :\n" ++msgstr "Les paquets supplémentaires suivants seront installés : " + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " -"n'est pas disponible :\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -2218,18 -2322,18 +2334,28 @@@ msgstr "optionnel msgid "extra" msgstr "supplémentaire" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Construction de l'arbre des dépendances" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versions possibles" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Génération des dépendances" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Fusion des informations disponibles" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Erreur d'écriture du fichier %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2240,55 -2344,59 +2366,59 @@@ msgstr "Impossible de traiter le fichie msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" - msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" + msgstr "" + "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" - msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" + msgstr "" + "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal formée dans la liste des sources %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" - msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" + msgstr "" + "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" - msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" + msgstr "" + "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:402 #, c-format @@@ -2307,14 -2415,15 +2437,15 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Le type de fichier d'index « %s » n'est pas accepté" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format - msgid "The package %s needs to be reinstalled, but I can't find an archive for it." + msgid "" + "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " "archive." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2322,7 -2431,7 +2453,7 @@@ msgstr " "Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être " "causé par les paquets devant être gardés en l'état." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problèmes, des paquets défecteux sont en mode " @@@ -2338,7 -2447,12 +2469,12 @@@ msgstr "Le répertoire %spartial pour le msgid "Archive directory %spartial is missing." msgstr "Le répertoire d'archive %spartial n'existe pas." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Téléchargement du fichier %li de %li (%s restant)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Le pilote pour la méthode %s n'a pu être trouvé." @@@ -2348,12 -2462,19 +2484,20 @@@ msgid "Method %s did not start correctly" msgstr "La méthode %s n'a pas démarré correctement" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" -"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la " -"touche Entrée." ++"Changement de support : veuillez insérer le disque\n" ++"« %s »\n" ++"dans le lecteur « %s » et appuyez sur la touche Entrée\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le système de paquet « %s » n'est pas supporté" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de déterminer un type du système de paquets adéquat" @@@ -2391,97 -2513,99 +2536,99 @@@ msgstr "Étiquette %s inconnue msgid "No priority (or zero) specified for pin" msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Le cache possède un système de version incompatible" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vous avez dépassé le nombre de noms de paquets que cet APT est capable de " "traiter." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." - msgstr "Vous avez dépassé le nombre de versions que cet APT est capable de traiter." + msgstr "" + "Vous avez dépassé le nombre de versions que cet APT est capable de traiter." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vous avez dépassé le nombre de dépendances que cet APT est capable de " "traiter." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des " "fichiers" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Assemblage des fichiers listés dans les champs Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" - msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" + msgstr "" + "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" @@@ -2495,7 -2619,7 +2642,7 @@@ msgstr " "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2504,14 -2628,15 +2651,15 @@@ msgstr " "Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " "que vous devrez corriger manuellement ce paquet." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format - msgid "The package index files are corrupted. No Filename: field for package %s." + msgid "" + "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Taille incohérente" @@@ -2533,12 -2658,12 +2681,12 @@@ msgstr " msgid "Identifying.. " msgstr "Identification..." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" -msgstr "Étiquette stockée : %s\n" +msgstr "Étiquette stockée : %s\n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cédérom\n" @@@ -2575,10 -2700,10 +2723,10 @@@ msgid " "This disc is called: \n" "'%s'\n" msgstr "" -"Ce disque s'appelle :\n" -"« %s »\n" +"Ce disque s'appelle :\n" +"« %s »\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." @@@ -2586,11 -2711,11 +2734,11 @@@ msgid "Writing new source list\n" msgstr "Écriture de la nouvelle liste de sources\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "Les entrées de listes de sources pour ce disque sont :\n" +msgstr "Les entrées de listes de sources pour ce disque sont :\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Démontage du cédérom..." @@@ -2616,238 -2741,56 +2764,279 @@@ msgstr " "%i enregistrements écrits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Préparation de %s" ++msgstr "Ouverture de %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Décompression de %s" ++msgstr "Ouverture de %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Préparation de la configuration de %s" ++msgstr "Ouverture du fichier de configuration %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Configuration de %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "%s installé" ++msgstr " Installé : " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Préparation de la suppression de %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Suppression de %s" ++msgstr "Ouverture de %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "%s supprimé" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Préparation de la purge de %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "%s purgé" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Connexion fermée prématurément" ++ +#~ msgid "The pkg cache must be initialize first" +#~ msgstr "Le cache des paquets doit être initialisé en premier" + +#~ msgid "Error occured while processing %s (NewPackage)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)" + +#~ msgid "Error occured while processing %s (UsePackage1)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" + +#~ msgid "Error occured while processing %s (UsePackage2)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" + +#~ msgid "Error occured while processing %s (NewFileVer1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#~ msgid "Error occured while processing %s (NewVersion1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" + +#~ msgid "Error occured while processing %s (UsePackage3)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" + +#~ msgid "Error occured while processing %s (NewVersion2)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" + +#~ msgid "Error occured while processing %s (FindPkg)" +#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)" + +#~ msgid "Error occured while processing %s (CollectFileProvides)" +#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" + +#~ msgid "Total Package Names : " +#~ msgstr "Nombre total de paquets : " + +#~ msgid " Normal Packages: " +#~ msgstr " Paquets ordinaires : " + +#~ msgid " Pure Virtual Packages: " +#~ msgstr " Paquets entièrement virtuels : " + +#~ msgid " Single Virtual Packages: " +#~ msgstr " Paquets virtuels simples : " + +#~ msgid " Mixed Virtual Packages: " +#~ msgstr " Paquets virtuels mixtes : " + +#~ msgid "Total Distinct Versions: " +#~ msgstr "Nombre de versions distinctes : " + +#~ msgid "Total Dependencies: " +#~ msgstr "Nombre de dépendances : " + +#~ msgid "Total Ver/File relations: " +#~ msgstr "Nombre de relations version/fichier : " + +#~ msgid "Total Provides Mappings: " +#~ msgstr "Nombre de relations « Provides » : " + +#~ msgid "Total Globbed Strings: " +#~ msgstr "Nombre de motifs rationnels : " + +#~ msgid "Total Dependency Version space: " +#~ msgstr "Espace occupé par les versions des dépendances : " + +#~ msgid "Total Slack space: " +#~ msgstr "Espace disque gaspillé : " + +#~ msgid "Total Space Accounted for: " +#~ msgstr "Total de l'espace attribué : " + +#~ msgid "Package Files:" +#~ msgstr "Fichiers du paquet :" + +#~ msgid "Pinned Packages:" +#~ msgstr "Paquets étiquetés :" + +#~ msgid " Package Pin: " +#~ msgstr " Étiquette de paquet : " + +#~ msgid " Version Table:" +#~ msgstr " Table de version :" + +#~ msgid "Error Processing directory %s" +#~ msgstr "Erreur lors du traitement du répertoire %s" + +#~ msgid "Error Processing Contents %s" +#~ msgstr "Erreur du traitement du contenu %s" + +#~ msgid "Unknown Compresison Algorithm '%s'" +#~ msgstr "Algorithme de compression « %s » inconnu" + +#~ msgid "Compress Child" +#~ msgstr "Fils compressé" + +#~ msgid "Internal Error, Failed to create %s" +#~ msgstr "Erreur interne, impossible de créer %s" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Les paquets doivent être enlevés mais la désinstallation est désactivée." + +#~ msgid "Do you want to continue? [Y/n] " +#~ msgstr "Souhaitez-vous continuer ? [O/n] " + +#~ msgid "Aborting Install." +#~ msgstr "Annulation de l'installation." + - #~ msgid "Internal Error, AllUpgrade broke stuff" - #~ msgstr "Erreur interne, AllUpgrade a cassé le boulot !" - +#~ msgid "Calculating Upgrade... " +#~ msgstr "Calcul de la mise à jour... " + +#~ msgid "Fetch Source %s\n" +#~ msgstr "Récupération des sources %s\n" + +#~ msgid "Supported Modules:" +#~ msgstr "Modules reconnus :" + - #~ msgid "" - #~ "Media Change: Please insert the disc labeled\n" - #~ " '%s'\n" - #~ "in the drive '%s' and press enter\n" - #~ msgstr "" - #~ "Changement de support : veuillez insérer le disque\n" - #~ "« %s »\n" - #~ "dans le lecteur « %s » et appuyez sur la touche Entrée\n" - +#~ msgid "Merging Available information" +#~ msgstr "Fusion des informations disponibles" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue" + +#~ msgid "Internal Error in AddDiversion" +#~ msgstr "Erreur interne dans AddDiversion" + +#~ msgid "Reading Package Lists" +#~ msgstr "Lecture des listes de paquets" + +#~ msgid "Internal Error getting a Package Name" +#~ msgstr "Erreur interne lors de l'obtention d'un nom de paquet" + +#~ msgid "Reading File Listing" +#~ msgstr "Lecture de la liste de fichiers" + +#~ msgid "Internal Error getting a Node" +#~ msgstr "Erreur interne lors de l'obtention d'un N½ud" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Erreur interne en ajoutant une déviation" + +#~ msgid "Reading File List" +#~ msgstr "Lecture de la liste des fichiers" + +#~ msgid "Failed to find a Package: Header, offset %lu" +#~ msgstr "Impossible de trouver un en-tête « Package: », décalage %lu" + +#~ msgid "Internal Error, could not locate member %s" +#~ msgstr "Erreur interne, ne peut localiser la partie %s" + +#~ msgid "Internal Error, could not locate member" +#~ msgstr "Erreur interne, ne peut localiser le membre" + +#~ msgid "Unparsible control file" +#~ msgstr "Fichier de contrôle non traitable" + +#~ msgid "" +#~ "Please use apt-cdrom to make this CD recognized by APT. apt-get update " +#~ "cannot be used to add new CDs" +#~ msgstr "" +#~ "Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par " +#~ "votre APT. apt-get update ne peut être employé pour ajouter de nouveaux " +#~ "cédéroms" + +#~ msgid "Wrong CD" +#~ msgstr "Mauvais cédérom" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Le serveur a refusé notre connexion et a répondu : %s" + +#~ msgid "Write Error" +#~ msgstr "Erreur d'écriture" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide" + +#~ msgid "This http server has broken range support" +#~ msgstr "Ce serveur http possède un support des limites non-valide" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "" +#~ "Erreur de lecture depuis le serveur distant et clôture de la connexion" + +#~ msgid "Bad header Data" +#~ msgstr "Mauvais en-tête de donnée" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Erreur syntaxique %s:%u : balise mal formée" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "A attendu %s mais il n'était pas présent" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "Cet APT ne supporte pas le système de version « %s »" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Construction de l'arbre des dépendances" + +#~ msgid "Candidate Versions" +#~ msgstr "Versions possibles" + +#~ msgid "Dependency Generation" +#~ msgstr "Génération des dépendances" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "" +#~ "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" + +#~ msgid "Vendor block %s is invalid" +#~ msgstr "Bloc de fournisseur %s invalide" + +#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" +#~ msgstr "" +#~ "Identifiant « %s » du fournisseur inconnu dans la ligne %u de la liste " +#~ "des sources %s" + +#~ msgid "File Not Found" +#~ msgstr "Fichier non trouvé" - diff --cc po/he.po index 8dae868ef,2ca30449f..4a80b9894 --- a/po/he.po +++ b/po/he.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s בשביל %s %s קומפל על %s %s\n" @@@ -231,7 -243,7 +243,7 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "לא מצליח לכתוב ל-%s" @@@ -519,79 -531,79 +531,79 @@@ msgstr " msgid "Failed to rename %s to %s" msgstr "כשלון בשינוי השם %s ל-%s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "לחבילות הבאות יש תלויות שלא נענו:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "אבל %s מותקנת" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "אבל %s הולכת להיות מותקנת" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "אבל היא אינה ניתנת להתקנה" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "אבל היא חבילה וירטואלית" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "אבל היא לא מותקנת" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "אבל היא אינה הולכת להיות מותקנת" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr "או" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "החבילות הבאות יוסרו:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "החבילות הבאות מעובות:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "החבילות הבאות ישודרגו:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "החבילות הבאות ישודרגו מטה:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "החבילות המחוזקות הבאות ישונו:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (בגלל %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -600,123 -612,144 +612,144 @@@ msgstr " "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu משודרגים, %lu מותקנים חדשים, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu מותקנות מחדש, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu משודרגות מטה, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "מתקן תלויות..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr "כשלון." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "לא מצליח לתקן תלויות" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr "סיום" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "החבילות הבאות ישודרגו:" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "לא מצליח לנעול את ספרית ההורדה." - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "צריך לקבל %sB מתוך הארכיונים.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "אחרי פריסה %sB נוספים ישוחררו.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "אין לך מספיק מקום פנוי ב-%s." + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "אין לך מספיק מקום פנוי ב-%s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "כן, עשה כפי שאני אומר!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -724,75 -757,75 +757,75 @@@ " ?] " msgstr "" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "בטל." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -800,79 -833,79 +833,97 @@@ "is only available from another source\n" msgstr "" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1429 ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -880,149 -913,159 +931,155 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "שגיאה פנימית, כלשון ביצירת %s" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1275,8 -1318,8 +1332,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@@ -1306,9 -1349,9 +1364,9 @@@ msgid "The info and temp directories ne msgstr "" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "" @@@ -2012,18 -2094,18 +2109,27 @@@ msgstr " msgid "extra" msgstr "" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++msgid "Reading state information" ++msgstr "" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "כשלון בפענוח %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2034,52 -2116,52 +2140,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:191 ++#: apt-pkg/sourcelist.cc:244 #, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2097,19 -2179,19 +2203,19 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@@ -2133,12 -2220,17 +2244,17 @@@ msgstr " msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2172,82 -2264,82 +2288,82 @@@ msgstr " msgid "No priority (or zero) specified for pin" msgstr "" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@@ -2256,7 -2348,7 +2372,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" @@@ -2267,20 -2359,20 +2383,20 @@@ msgid " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" diff --cc po/hu.po index 5dbebd086,a418bca8d..f865f30b3 --- a/po/hu.po +++ b/po/hu.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@@ -150,8 -150,8 +150,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" @@@ -291,7 -307,7 +307,7 @@@ msgstr " " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@@ -620,79 -636,79 +636,79 @@@ msgstr "Probléma %s unlinkelésekor msgid "Failed to rename %s to %s" msgstr "Nem sikerült átnevezni a következőt: %s erre: %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "I" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "A következő csomagoknak teljesítetlen függőségei vannak:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "de az nem telepíthető" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "de az nincs telepítve" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " vagy" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "A következő ÚJ csomagok lesznek telepítve:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "A következő csomagok el lesznek TÁVOLÍTVA:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "A következő csomagok vissza lesznek tartva:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "A következő csomagok frissítve lesznek:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "A következő csomagok VISSZA lesznek fejlesztve:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "A következő visszatartott csomagok fel lesznek váltva:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -701,122 -717,144 +717,144 @@@ msgstr " "FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n" "Ezt nem kellene megtenni, kivéve ha pontosan tudod mit csinálsz!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu csomag frissítve lesz, %lu új csomag lesz telepítve, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu újra lesz telepítve, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu vissza lesz fejlesztve, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu el lesz távolítva és %lu nem lesz frissítve.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu csomag nincs teljesen telepítve vagy eltávolítva.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Függőségek javítása..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " sikertelen." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a függőségeket" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Kész" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbáld a -f használatával." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELMEZTETÉS: A következő csomagok nem hitelesíthetőek!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Telepíti ezeket a csomagokat ellnőrzés nélkül (y/N)? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Belső hiba egy eltérítés hozzáadásakor" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Az archívumokból %sB/%sB-t kell letölteni.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB-t kell letölteni az archívumokból.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Kicsomagolás után %sB lemezterület lesz felhasználva.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület kerül felszabadításra.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Nincs elég szabad hely itt: %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -827,28 -865,28 +865,28 @@@ msgstr " "A folytatáshoz írd be a következő kifejezést '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Megszakítva." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nem sikerült letölteni a következőt: %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -856,47 -894,47 +894,47 @@@ msgstr " "Nem lehet letölteni néhány archívot, talán próbáld az apt-get update -et " "vagy a --fix-missing -et." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing és a média csere még nem támogatott" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Telepítés megszakítása." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Megjegyzés: %s kiválasztása %s helyett\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "A(z) %s csomag nincs telepítve, így nem távolítható el\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "A(z) %s egy virtuális csomag, amit a következő szolgáltat:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Telepítve]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Egyet határozottan ki kell választanod telepítésre." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -907,49 -945,49 +945,49 @@@ msgstr " "hivatkozik rá. Ez azt jelentheti, hogy a csomag hiányzik, elavult,\n" "vagy csak más forrásból érhető el\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Azonban a következő csomagok felváltják:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "A(z) %s csomagnak nincs jelöltje a telepítéshez" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' kiadás ehhez: '%s' nem található" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' verzió ehhez: '%s' nem található" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -957,26 -995,26 +995,45 @@@ msgstr " "Néhány index fájlt nem sikerült letölteni, ezek mellőzve lesznek, vagy a " "régi változatuk lesz használva." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "A következő információ talán segít megoldani a helyzetet:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Belső hiba, AllUpgrade megsértett valamit" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Nem található a(z) %s csomag" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -984,7 -1022,7 +1041,7 @@@ msgstr " "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -996,7 -1034,7 +1053,7 @@@ msgstr " "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1006,108 -1044,118 +1063,114 @@@ msgstr " "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "A következő információ talán segít megoldani a helyzetet:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Törött csomagok" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "A következő extra csomagok kerülnek telepítésre:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Javasolt csomagok:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Sikertelen" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Kész" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Belső hiba, AllUpgrade megsértett valamit" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrásarchívot kell letölteni.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrásarchívumot kell letölteni.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1116,7 -1164,7 +1179,7 @@@ msgstr " "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1125,32 -1173,32 +1188,32 @@@ msgstr " "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verziókövetelményt kielégítő elérhető verziója." - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Támogatott modulok:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1454,8 -1502,8 +1517,9 @@@ msgstr "Csomagtalálat felülírása % msgid "File %s/%s overwrites the one in the package %s" msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "A(z) %s nem olvasható" @@@ -1485,9 -1533,9 +1549,9 @@@ msgid "The info and temp directories ne msgstr "Az info és temp könyvtáraknak ugyanazon a fájlrendszeren kell lenniük" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Csomaglisták olvasása" @@@ -2204,18 -2292,18 +2308,28 @@@ msgstr "opcionális msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Függőségi fa építése" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Lehetséges verziók" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Függőséggenerálás" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Elérhető információk egyesítése" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Nem sikerült a(z) %s fájlba írni" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2226,52 -2314,52 +2340,52 @@@ msgstr "Nem lehet a(z) %s csomagfájlt msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s megnyitása" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" @@@ -2292,13 -2380,13 +2406,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "A(z) '%s' indexfájltípus nem támogatott" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "A(z) %s csomagot újra kell telepíteni, de nem találok hozzá archívot." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2306,7 -2394,7 +2420,7 @@@ msgstr " "Hiba, pkgProblemResolver::Resolve sérüléseket generált, ezt visszatartott " "csomagok okozhatják." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "A problémák nem javíthatók, sérült visszatartott csomagok vannak a " @@@ -2332,12 -2425,20 +2451,20 @@@ msgstr "A(z) %s metódus vezérlő nem msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el helyesen" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Kérlek tedd be a(z)\n" + " %s\n" + "címkéjű lemezt a(z) %s meghajtóba és üss entert\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelő csomagrendszer típusa nem határozható meg" @@@ -2373,87 -2474,87 +2500,87 @@@ msgstr "A(z) %s tűtípus nem értelmez msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Hiba adódott a(z) %s feldolgozásakor (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Hiba adódott a(z) %s feldolgozásakor (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" # FIXME --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" @@@ -2462,7 -2563,7 +2589,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" @@@ -2475,7 -2576,7 +2602,7 @@@ msgstr " "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot. (hiányzó arch. miatt)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2484,14 -2585,14 +2611,14 @@@ msgstr " "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@@ -2593,3 -2694,57 +2720,57 @@@ msgstr "%i rekord kiírva %i hibásan p #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s megnyitása" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s megnyitása" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "%s konfigurációs fájl megnyitása" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Kapcsolódás a következőhöz: %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Telepítve: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s megnyitása" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Ajánlja" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "A kapcsolat idő előtt befejeződött" diff --cc po/it.po index edb215bbc,cb0f28ec7..5d6a66fd5 --- a/po/it.po +++ b/po/it.po @@@ -5,8 -5,8 +5,8 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-10-05 17:38+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-03-26 00:42+0100\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@@ -146,8 -146,8 +146,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" @@@ -290,7 -302,7 +302,7 @@@ msgstr " " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" @@@ -323,8 -335,7 +335,8 @@@ msgstr "Errore nella scrittura dell'hea msgid "Error processing contents %s" msgstr "Errore nell'analisi dei contents %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -619,80 -630,79 +631,80 @@@ msgstr "Problema nell'unlink di %s msgid "Failed to rename %s to %s" msgstr "Impossibile rinominare %s in %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ma %s è installato" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ma %s sta per essere installato" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ma non è installabile" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ma non è installato" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " oppure" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -701,126 -711,150 +713,151 @@@ msgstr " "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi (downgraded), " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze in corso..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " fallita." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Fatto" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "È consigliabile eseguire `apt-get -f install' per correggere questi problemi." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Avviso di autenticazione disabilitato \n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installare questi pacchetti senza la verifica [s/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Non è stato possibile autenticare alcuni pacchetti" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Sussistono dei problemi e -y è stata usata senza --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 ++#, fuzzy + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" -"Errore interno, InstallPackages è stato chiamato con un pacchetto rotto!" ++msgstr "Errore interno, InstallPackages Ú stato chiamato con un pacchetto rotto!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove è disabilitato." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Errore interno, l'ordinamento non è terminato" ++msgstr "Errore interno, l'ordinamento non Ú finito" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non può essere letta." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + "Che strano... le dimensioni non corrispondono, inviare un'email a " + "apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "È necessario prendere %sB/%sB di archivi. \n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "È necessario prendere %sB di archivi. \n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "Impossibile determinare lo spazio libero su %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Lo spazio libero in %s non è sufficente." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "È stata specificata la modalità Trivial Only ma questa non è un'operazione " "triviale" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -830,28 -864,28 +867,28 @@@ msgstr " "Per continuare scrivere la frase '%s' \n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Interrotto." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Il download di alcuni file è fallito" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Download completato e in modalità download-only" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -859,102 -893,103 +896,102 @@@ msgstr " "Impossibile prendere alcuni archivi, forse è meglio eseguire apt-get update " "o provare l'opzione --fix-missing" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su media estraibili non è ancora supportato" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Interruzione dell'installazione in corso." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, si sta selezionando %s al posto di %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s è stato saltato, perché è già installato e l'aggiornamento non è stato " "impostato.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Il pacchetto %s non è installato, quindi non è stato rimosso\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installato]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Bisogna esplicitamente sceglierne uno da installare." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"Il pacchetto %s non ha versioni disponibili, ma ma è nominato da un " -"altropacchetto.\n" -" Questo significa che il pacchetto manca, è diventato obsoletoo è " -"disponibile solo all'interno di un'altra sorgente\n" +"Il pacchetto %s non ha versioni disponibili, ma .\n" +"Questo significa che il pacchetto è diventato obsoleto oùnè disponibile " +"all'interno da un'altra sorgente\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Comunque il seguente pacchetto lo sostituisce:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Il pacchetto %s non ha candidati da installare" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstallazione di %s non è possibile, non può esssere scaricato.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s è già alla versione più recente.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non è stata trovata la release '%s' per '%s'" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non è stata trovata la versione '%s' per '%s'" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versione selezionata %s (%s) per %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -962,26 -997,26 +999,45 @@@ msgstr " "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " "si useranno quelli precedenti." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Errore interno, problem resolver ha rotto qualcosa" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, si sta selezionando %s per la regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "È consigliabile eseguire 'apt-get -f install' per correggere questi problemi:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -989,7 -1024,7 +1045,7 @@@ msgstr " "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1001,7 -1036,7 +1057,7 @@@ msgstr " "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" "richiesti non sono ancora stati creati o rimossi da incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1011,107 -1046,116 +1067,113 @@@ msgstr " "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pacchetto non integro" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallito" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Fatto" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Errore interno, problem resolver ha rotto qualcosa" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non è sufficente" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario prendere %sB/%sB di sorgenti.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario prendere %sB di sorgenti\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Non è stato possibile scaricare alcuni archivi." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Si è saltata l'estrazione del sorgente già estratto in %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Verificare se il pacchetto 'dpkg-dev' è installato.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Processo figlio fallito" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Bisogna specificare almeno un pacchetto di cui controllare la generazione di " "dipendenze" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1120,7 -1164,7 +1182,7 @@@ msgstr " "%s dipendenze per %s non possono essere soddisfatte perché non si trova il " "pacchetto %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1129,32 -1173,32 +1191,32 @@@ msgstr " "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione " "del pacchetto %s può soddisfare le richieste di versione" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " "è troppo nuovo" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s è fallita" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non è stato possibile soddisfare le dipendenze di costruzione per %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione è fallito" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Moduli supportati:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1469,8 -1513,8 +1531,9 @@@ msgstr "Il pacchetto sovrascritto corri msgid "File %s/%s overwrites the one in the package %s" msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" @@@ -1500,9 -1544,9 +1563,9 @@@ msgid "The info and temp directories ne msgstr "Le directory temp e info devono essere sullo stesso filesystem" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Lettura della lista dei pacchetti in corso" @@@ -1631,7 -1675,11 +1694,12 @@@ msgstr "CD-ROM sbagliato msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Disco non trovato" ++msgstr "File non trovato" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "File non trovato" @@@ -1853,6 -1902,47 +1922,44 @@@ msgstr "È accaduto qualcosa di anormal msgid "Unable to connect to %s %s:" msgstr "Impossibile connettersi a %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" -"E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Errore interno: Firma corretta, ma non è stato possibile determinare il " -"fingerprint della chiave?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Almeno una firma non valida è stata trovata." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Impossibile eseguire " ++msgstr "Impossibile ottenere il lock %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " per verificare la firma (gnugp è installato?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Errore sconosciuto durante l'esecuzione di gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Le seguenti firme non erano valide:\n" ++msgstr "I seguenti pacchetti verranno inoltre installati:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Le seguenti firme non sono state verificate perchè la chiave pubblica non è " -"disponibile:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -2221,18 -2307,18 +2324,28 @@@ msgstr "opzionale msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Generazione dell'albero delle dipendenze in corso" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versioni candidate" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generazione delle dipendenze" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Aggiornamento delle informazioni disponibili" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Scrittura del file %s fallita" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2243,52 -2329,52 +2356,52 @@@ msgstr "Impossibile analizzare il file msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La linea %lu in %s (URI) non è corretta" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La linea %lu in %s (dist) non è corretta" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La linea %lu in %s (URI parse) non è corretta" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non è corretta" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La linea %lu in %s (dist parse) non è corretta" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Apertura di %s in corso" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linea %u troppo lunga nel source list %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La linea %u in %s (type) non è corretta" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Il tipo '%s' non è riconosciuto alla linea %u nella lista sorgente %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La linea %u in %s (vendor id) non è corretta" @@@ -2309,7 -2395,7 +2422,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Il file indice di tipo '%s' non è supportato" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2317,7 -2403,7 +2430,7 @@@ msgstr " "Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un " "archivio per esso." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2325,7 -2411,7 +2438,7 @@@ msgstr " "Errore, pkgProblemResolver::Resolve ha generato uno stop, questo può essere " "causato da pacchetti bloccati " --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati" @@@ -2339,7 -2425,12 +2452,12 @@@ msgstr "Manca la directory di liste %sp msgid "Archive directory %spartial is missing." msgstr "Manca la directory di archivio %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Scaricamento del file %li di %li (%s rimanente)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Non è stato possibile trovare un driver per il metodo %s." @@@ -2349,12 -2440,19 +2467,20 @@@ msgid "Method %s did not start correctly" msgstr "Il metodo %s non è partito correttamente" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" -"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " -"invio." ++"Cambio disco: Inserire il disco chiamato\n" ++" '%s'\n" ++"nel dispositivo '%s' e premere invio\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non è supportato" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" @@@ -2389,89 -2487,89 +2515,89 @@@ msgstr "Impossibile capire il tipo di p msgid "No priority (or zero) specified for pin" msgstr "Nessuna (o zero) priorità specificata per il pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "La cache ha un sistema incompatibile di gestione delle versioni" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Errore nell'analisi di %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errore nell'analisi di %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errore nell'analisi di %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errore nell'analisi di %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errore nell'analisi di %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errore nell'analisi di %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errore nell'analisi di %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "WOW, si è ecceduto il numero massimo di nomi di pacchetti che questo APT è " "capace di gestire" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "WOW, si è ecceduto il numero massimo di versioni che questo APT è capace di " "gestire" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "WOW, si è ecceduto il numero massimo di dipendenze che questo APT è capace " "di gestire" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errore nell'analisi di %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errore nell'analisi di %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "È stato impossibile trovare %s %s mentre si processava le dipendenze dei file" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile controllare la lista dei pacchetti sorgente %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Il File Collezionato Fornisce" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvataggio del cache sorgente" @@@ -2480,7 -2578,7 +2606,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" @@@ -2494,7 -2592,7 +2620,7 @@@ msgstr " "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2503,7 -2601,7 +2629,7 @@@ msgstr " "Non è stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2511,7 -2609,7 +2637,7 @@@ msgstr " "I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il " "pacchetto %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@@ -2614,6 -2712,60 +2740,60 @@@ msgstr "Scritti %i record con %i file s msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Scritti %i record con %i file mancanti e %i file senza match\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Preparazione di %s in corso" ++msgstr "Apertura di %s in corso" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Scompattamento di %s in corso" ++msgstr "Apertura di %s in corso" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Preparazione alla configurazione di %s in corso" ++msgstr "Apertura del file di configurazione %s in corso" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Configurazione di %s in corso" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "%s Installato" ++msgstr " Installato: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Preparazione per la rimozione di %s in corso" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Rimozione di %s in corso" ++msgstr "Apertura di %s in corso" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "%s rimosso" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Preparazione per la rimozione con la configurazione %s in corso" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Rimosso con la configurazione %s" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Connessione chiusa prematuramente" + #~ msgid "Write Error" #~ msgstr "Errore di Scrittura" @@@ -2722,11 -2871,8 +2899,8 @@@ #~ msgid "" #~ "Unable to locate any package files, perhaps this is not a Debian Disc" -#~ msgstr "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian" +#~ msgstr "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian" - #~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" - #~ msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'" - #~ msgid " '" #~ msgstr " '" diff --cc po/ja.po index acd03c6cc,2632266ea..84c3b1e68 --- a/po/ja.po +++ b/po/ja.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-09 12:54+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ¥³¥ó¥Ñ¥¤¥ëÆü»þ: %s %s\n" @@@ -289,7 -305,7 +305,7 @@@ msgstr " " -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤߤ³¤à\n" " -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òŬÍѤ¹¤ë(Îã: -o dir::cache=/tmp)\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó" @@@ -618,79 -634,79 +634,79 @@@ msgstr "%s ¤Î unlink ¤ÇÌäÂ꤬ȯÀ¸¤·¤Þ¤· msgid "Failed to rename %s to %s" msgstr "%s ¤ò %s ¤Ë¥ê¥Í¡¼¥à¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Àµµ¬É½¸½¤ÎŸ³«¥¨¥é¡¼ - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤ÏËþ¤¿¤»¤Ê¤¤°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "¤·¤«¤·¡¢%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "¤·¤«¤·¡¢%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "¤·¤«¤·¡¢¤³¤ì¤Ï²¾Áۥѥ屡¼¥¸¤Ç¤¹" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤»¤ó" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ¤Þ¤¿¤Ï" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¿·¤¿¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Öºï½ü¡×¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÏÊÝᤵ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Ö¥À¥¦¥ó¥°¥ì¡¼¥É¡×¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "°Ê²¼¤ÎÊѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼¥¸¤ÏÊѹ¹¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (%s ¤Î¤¿¤á) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -699,124 -715,146 +715,146 @@@ msgstr " "·Ù¹ð: °Ê²¼¤ÎÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤Þ¤¹\n" "²¿¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤«¤¬¤Á¤ã¤ó¤È¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¼Â¹Ô¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É: %lu ¸Ä¡¢¿·µ¬¥¤¥ó¥¹¥È¡¼¥ë: %lu ¸Ä¡¢" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "ºÆ¥¤¥ó¥¹¥È¡¼¥ë: %lu ¸Ä¡¢" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "¥À¥¦¥ó¥°¥ì¡¼¥É: %lu ¸Ä¡¢" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ºï½ü: %lu ¸Ä¡¢ÊÝα: %lu ¸Ä¡£\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Þ¤¿¤Ïºï½ü¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "°Í¸´Ø·¸¤ò²ò·è¤·¤Æ¤¤¤Þ¤¹..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " ¼ºÇÔ¤·¤Þ¤·¤¿¡£" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "°Í¸´Ø·¸¤òľ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥»¥Ã¥È¤òºÇ¾®²½¤Ç¤­¤Þ¤»¤ó" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " ´°Î»" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "¤³¤ì¤é¤òľ¤¹¤¿¤á¤Ë¤Ï 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»" "¤ó¡£" --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "̤²ò·è¤Î°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹¡£-f ¥ª¥×¥·¥ç¥ó¤ò»î¤·¤Æ¤¯¤À¤µ¤¤¡£" --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "·Ù¹ð: °Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ïǧ¾Ú¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "¸¡¾Ú¤Ê¤·¤Ë¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤« [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ç§¾Ú¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "ÌäÂ꤬ȯÀ¸¤·¡¢-y ¥ª¥×¥·¥ç¥ó¤¬ --force-yes ¤Ê¤·¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢ºï½ü¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "ÆâÉô¥¨¥é¡¼¡¢diversion ¤ÎÄɲÃ" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "¥À¥¦¥ó¥í¡¼¥É¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "¥½¡¼¥¹¤Î¥ê¥¹¥È¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%2$sB Ãæ %1$sB ¤Î¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB ¤Î¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Ÿ³«¸å¤ËÄÉ²Ã¤Ç %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬¾ÃÈñ¤µ¤ì¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ÿ³«¸å¤Ë %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬²òÊü¤µ¤ì¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only ¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¤¬¡¢¤³¤ì¤Ï´Êñ¤ÊÁàºî¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -827,28 -865,28 +865,28 @@@ msgstr " "³¹Ô¤¹¤ë¤Ë¤Ï¡¢'%s' ¤È¤¤¤¦¥Õ¥ì¡¼¥º¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "ÃæÃǤ·¤Þ¤·¤¿¡£" - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "³¹Ô¤·¤Þ¤¹¤« [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "¥À¥¦¥ó¥í¡¼¥É¥ª¥ó¥ê¡¼¥â¡¼¥É¤Ç¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤¬´°Î»¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -856,49 -894,49 +894,49 @@@ msgstr " "¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£apt-get update ¤ò¼Â¹Ô¤¹¤ë¤« --fix-" "missing ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æ»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ¤È¥á¥Ç¥£¥¢¸ò´¹¤Ï¸½ºßƱ»þ¤Ë¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "­¤ê¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤òľ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤òÃæÃǤ·¤Þ¤¹¡£" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Ãí°Õ¡¢%2$s ¤ÎÂå¤ï¤ê¤Ë %1$s ¤òÁªÂò¤·¤Þ¤¹\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢%s ¤ò¥¹¥­¥Ã¥×" "¤·¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢ºï½ü¤Ï¤Ç¤­¤Þ¤»¤ó\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s ¤Ï°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë²¾Áۥѥ屡¼¥¸¤Ç¤¹:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌÀ¼¨Åª¤ËÁªÂò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -909,49 -947,49 +947,49 @@@ msgstr " "¤ª¤½¤é¤¯¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«¡¢¤â¤¦¸Å¤¯¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢\n" "¤¢¤ë¤¤¤ÏÊ̤Υ½¡¼¥¹¤«¤é¤Î¤ß¤·¤«ÍøÍѤǤ­¤Ê¤¤¤È¤¤¤¦¾õ¶·¤¬¹Í¤¨¤é¤ì¤Þ¤¹\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "¤·¤«¤·¡¢°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Þ¤¹:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¸õÊ䤬¤¢¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "¥À¥¦¥ó¥í¡¼¥É¤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¢%s ¤ÎºÆ¥¤¥ó¥¹¥È¡¼¥ë¤ÏÉÔ²Äǽ¤Ç¤¹¡£\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ¤Ï´û¤ËºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' ¤Î¥ê¥ê¡¼¥¹ '%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' ¤Î¥Ð¡¼¥¸¥ç¥ó '%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s ¤Ë¤Ï¥Ð¡¼¥¸¥ç¥ó %1$s (%2$s) ¤òÁªÂò¤·¤Þ¤·¤¿\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "update ¥³¥Þ¥ó¥É¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "list ¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -959,27 -997,27 +997,46 @@@ msgstr " "¤¤¤¯¤Ä¤«¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ìµ»ë¤µ¤ì¤¿¤«¡¢¤¢" "¤ë¤¤¤Ï¸Å¤¤¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤·¤¿¡£" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "°Ê²¼¤Î¾ðÊ󤬤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤ËÌòΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ãí°Õ: Àµµ¬É½¸½ '%2$s' ¤ËÂФ·¤Æ %1$s ¤òÁªÂò¤·¤Þ¤·¤¿\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "°Ê²¼¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì" "¤Þ¤»¤ó:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -987,7 -1025,7 +1044,7 @@@ msgstr " "̤²ò·è¤Î°Í¸´Ø·¸¤Ç¤¹¡£'apt-get -f install' ¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤(¤Þ¤¿¤Ï²òË¡" "¤òÌÀ¼¨¤·¤Æ¤¯¤À¤µ¤¤)¡£" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -999,7 -1037,7 +1056,7 @@@ msgstr " "Incoming ¤«¤é°ÜÆ°¤µ¤ì¤Æ¤¤¤Ê¤¤¡¢ÉÔ°ÂÄêÈǥǥ£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò»ÈÍѤ·\n" "¤Æ¤¤¤ë¤â¤Î¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1009,107 -1047,117 +1066,113 @@@ msgstr " "²ÄǽÀ­¤¬¹â¤¤¤Ç¤¹¡£¤½¤Î¤¿¤á¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ¤¯¤À\n" "¤µ¤¤¡£" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "°Ê²¼¤Î¾ðÊ󤬤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤ËÌòΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "°Ê²¼¤ÎÆÃÊ̥ѥ屡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Äó°Æ¥Ñ¥Ã¥±¡¼¥¸:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "¿ä¾©¥Ñ¥Ã¥±¡¼¥¸:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡½Ð¤·¤Æ¤¤¤Þ¤¹... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "¼ºÇÔ" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "´°Î»" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "¥½¡¼¥¹¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "%s ¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB Ãæ %1$sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "¥½¡¼¥¹ %s ¤ò¼èÆÀ\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "¤¹¤Ç¤Ë %s ¤ËŸ³«¤µ¤ì¤¿¥½¡¼¥¹¤¬¤¢¤ë¤¿¤á¡¢Å¸³«¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ÿ³«¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "¥Ó¥ë¥É¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "»Ò¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "builddeps ¤ò¥Á¥§¥Ã¥¯¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¾¯¤Ê¤¯¤È¤â 1 ¤Ä»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s ¤Î build-dependency ¾ðÊó¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s ¤Ë¤Ï build depends ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1118,7 -1166,7 +1181,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸ %3$s ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂФ¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È" "¤¬¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1127,32 -1175,32 +1190,32 @@@ msgstr " "Æþ¼ê²Äǽ¤Ê %3$s ¤Ï¤¤¤º¤ì¤â¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ¤ÎÍ×µá¤òËþ¤¿¤»¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂÐ" "¤¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ %3$s ¥Ñ¥Ã" "¥±¡¼¥¸¤Ï¿·¤·¤¹¤®¤Þ¤¹" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s ¤Î Build-dependency ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "build dependency ¤Î½èÍý¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1460,8 -1508,8 +1523,9 @@@ msgstr "%s ¤ËÂФ¹¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¤Ê¤¤¥Ñ¥Ã msgid "File %s/%s overwrites the one in the package %s" msgstr "¥Õ¥¡¥¤¥ë %s/%s ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¤â¤Î¤ò¾å½ñ¤­¤·¤Þ¤¹" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s ¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" @@@ -1491,9 -1539,9 +1555,9 @@@ msgid "The info and temp directories ne msgstr "info ¤È temp ¥Ç¥£¥ì¥¯¥È¥ê¤ÏƱ¤¸¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤òÆɤߤ³¤ó¤Ç¤¤¤Þ¤¹" @@@ -2205,18 -2293,18 +2309,28 @@@ msgstr "Ǥ°Õ msgid "extra" msgstr "ÆÃÊÌ" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "°Í¸´Ø·¸¥Ä¥ê¡¼¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "¸õÊä¥Ð¡¼¥¸¥ç¥ó" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "°Í¸´Ø·¸¤ÎÀ¸À®" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Æþ¼ê²Äǽ¾ðÊó¤ò¥Þ¡¼¥¸¤·¤Æ¤¤¤Þ¤¹" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "%s ¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2227,52 -2315,52 +2341,52 @@@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ msgid "Unable to parse package file %s (2)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI parse)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (absolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹¡£" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤Ë¤¢¤ë¥¿¥¤¥× '%1$s' ¤ÏÉÔÌÀ¤Ç¤¹" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (vendor id)" @@@ -2293,7 -2381,7 +2407,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥× '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2301,7 -2389,7 +2415,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸ %s ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¤½¤Î¤¿¤á¤Î¥¢¡¼¥«¥¤¥Ö¤ò¸«" "¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2309,7 -2397,7 +2423,7 @@@ msgstr " "¥¨¥é¡¼¡¢pkgProblemResolver::Resolve ¤ÏÄä»ß¤·¤Þ¤·¤¿¡£¤ª¤½¤é¤¯Êѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼" "¥¸¤¬¸¶°ø¤Ç¤¹¡£" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "ÌäÂê¤ò²ò·è¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£²õ¤ì¤¿Êѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹¡£" @@@ -2333,12 -2426,20 +2452,20 @@@ msgstr "¥á¥½¥Ã¥É¥É¥é¥¤¥Ð %s ¤¬¸«¤Ä¤«¤ê¤ msgid "Method %s did not start correctly" msgstr "¥á¥½¥Ã¥É %s ¤¬Àµ¾ï¤Ë³«»Ï¤·¤Þ¤»¤ó¤Ç¤·¤¿" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "¥á¥Ç¥£¥¢Êѹ¹: \n" + " '%s'\n" + "¤È¥é¥Ù¥ë¤ÎÉÕ¤¤¤¿¥Ç¥£¥¹¥¯¤ò¥É¥é¥¤¥Ö '%s' ¤ËÆþ¤ì¤Æ enter ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¥·¥¹¥Æ¥à '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "ŬÀڤʥѥ屡¼¥¸¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó" @@@ -2378,82 -2479,82 +2505,82 @@@ msgstr "pin ¥¿¥¤¥× %s ¤¬Íý²ò¤Ç¤­¤Þ¤»¤ó¤ msgid "No priority (or zero) specified for pin" msgstr "pin ¤ÇÍ¥ÀèÅÙ (¤Þ¤¿¤Ï 0) ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "¥­¥ã¥Ã¥·¥å¤ËÈó¸ß´¹¤Ê¥Ð¡¼¥¸¥ç¥Ë¥ó¥°¥·¥¹¥Æ¥à¤¬¤¢¤ê¤Þ¤¹" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¡£" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î¥Ð¡¼¥¸¥ç¥ó¤¬Í׵ᤵ¤ì¤Þ¤·¤¿¡£" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î°Í¸´Ø·¸¤¬È¯À¸¤·¤Þ¤·¤¿¡£" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s %s ¤¬¥Õ¥¡¥¤¥ë°Í¸¤Î½èÍýÃæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È %s ¤¬ stat ¤Ç¤­¤Þ¤»¤ó" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "¥Õ¥¡¥¤¥ëÄ󶡾ðÊó¤ò¼ý½¸¤·¤Æ¤¤¤Þ¤¹" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤ÎÊݸÃæ¤Ë IO ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" @@@ -2462,7 -2563,7 +2589,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "¥ê¥Í¡¼¥à¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£%s (%s -> %s)" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ¤¬Å¬¹ç¤·¤Þ¤»¤ó" @@@ -2475,7 -2576,7 +2602,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°" "¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ (¸ºß¤·¤Ê¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¤¿¤á)¡£" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2484,7 -2585,7 +2611,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°" "¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2492,7 -2593,7 +2619,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë Filename: " "¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "¥µ¥¤¥º¤¬Å¬¹ç¤·¤Þ¤»¤ó" @@@ -2599,5 -2700,59 +2726,59 @@@ msgstr " "%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£%i ¸Ä¤Î¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤é¤º¡¢%i ¸Ä¤ÎŬ¹ç¤·¤Ê¤¤" "¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "%s ¤ØÀܳ¤·¤Æ¤¤¤Þ¤¹" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "¿ä¾©" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "ÅÓÃæ¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Þ¤·¤¿" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤ËÉÔÌÀ¤Ê¥Ù¥ó¥À ID '%1$s' ¤¬¤¢¤ê¤Þ¤¹" diff --cc po/ko.po index ebb80cb0d,38029aae1..a57ca6ff6 --- a/po/ko.po +++ b/po/ko.po @@@ -4,7 -4,7 +4,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@@ -144,8 -144,8 +144,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n" @@@ -285,7 -301,7 +301,7 @@@ msgstr " " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@@ -615,79 -631,79 +631,79 @@@ msgstr "%s의 링크를 해제하는 ë msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "다음 꾸러미의 의존성이 맞지 않습니다:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "하지만 %s 꾸러미를 설치했습니다" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 꾸러미를 설치할 것입니다" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "하지만 가상 꾸러미입니다" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "하지만 %s 꾸러미를 설치하지 않을 것입니다" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " 혹은" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "다음 새 꾸러미를 설치할 것입니다:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "다음 꾸러미를 지울 것입니다:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "다음 꾸러미를 과거 버전으로 유지합니다:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "다음 꾸러미를 업그레이드할 것입니다:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "다음 꾸러미를 다운그레이드할 것입니다:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 꾸러미를 바꿀 것입니다:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -696,126 -712,148 +712,148 @@@ msgstr " "경고: ê¼­ 필요한 다음 꾸러미를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "의존성을 바로잡는 중입니다..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " 실패." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "의존성을 바로잡을 수 없습니다" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "업그레이드 집합을 최소화할 수 없습니다" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " 완료" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "경고: 다음 꾸러미를 인증할 수 없습니다!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 꾸러미가 있습니다" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "diversion을 추가하는 데 내부 오류" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바이트 아카이브를 받아야 합니다.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "%s에 충분한 공간이 없습니다" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " "아닙니다." # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -826,28 -864,28 +864,28 @@@ msgstr " "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "중단." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -855,48 -893,48 +893,48 @@@ msgstr " "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "빠진 꾸러미를 바로잡을 수 없습니다." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "설치를 중단합니다." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [설치함]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "설치하려면 분명하게 하나를 선택해야 합니다." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -907,49 -945,49 +945,49 @@@ msgstr " "해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" "꾸러미를 받아와야 하는 경우일 수도 있습니다.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "하지만 다음 꾸러미가 대체합니다:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s 꾸러미를 다시 설치하는 ê±´ 불가능합니다. 내려 받을 수 없습니다.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 꾸러미는 이미 최신 버전입니다.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -957,26 -995,26 +995,45 @@@ msgstr " "일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버" "전을 대신 사용합니다." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -984,7 -1022,7 +1041,7 @@@ msgstr " "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -995,7 -1033,7 +1052,7 @@@ msgstr " "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1004,105 -1042,115 +1061,111 @@@ msgstr " "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "망가진 꾸러미" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "실패" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "완료" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 꾸러미를 찾을 수 없습니다" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1111,7 -1159,7 +1174,7 @@@ msgstr " "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1120,32 -1168,32 +1183,32 @@@ msgstr " "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너" "무 최근 버전입니다" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "지원하는 모듈:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1450,8 -1498,8 +1513,9 @@@ msgstr "덮어 쓰는 꾸러미가 %s ê msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s 파일은 %s 꾸러미에 있는 파일을 덮어 씁니다" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" @@@ -1481,9 -1529,9 +1545,9 @@@ msgid "The info and temp directories ne msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "꾸러미 목록을 읽는 중입니다" @@@ -2193,18 -2281,18 +2297,28 @@@ msgstr "옵션 msgid "extra" msgstr "별도" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "의존성 트리를 만드는 중입니다" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "후보 버전" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "의존성 만들기" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "이용 가능 꾸러미 정보를 합칩니다" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "%s 파일을 쓰는 데 실패했습니다" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2215,52 -2303,52 +2329,52 @@@ msgstr "꾸러미 파일 %s 파일을 í msgid "Unable to parse package file %s (2)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "소스 리스트 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)" @@@ -2281,14 -2369,14 +2395,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2296,7 -2384,7 +2410,7 @@@ msgstr " "오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수" "도 있습니다." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다." @@@ -2320,12 -2413,20 +2439,20 @@@ msgstr "설치 방법 드라이버 %sì msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "미디어 바꾸기: '%2$s' 드라이브에 다음 레이블이 달린\n" + "디스크를 넣고 enter를 누르십시오\n" + " '%1$s'\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다" @@@ -2359,82 -2460,82 +2486,82 @@@ msgstr "핀 타입 %s이(가0 무엇인 msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "캐시의 버전 시스템이 호환되지 않습니다" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "와우, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "와우, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "와우, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s 처리중에 오류가 발생했습니다 (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s 처리중에 오류가 발생했습니다 (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 꾸러미가 없습니다" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 꾸러미 목록 %s의 정보를 읽을 수 없습니다" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" @@@ -2443,7 -2544,7 +2570,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" @@@ -2456,7 -2557,7 +2583,7 @@@ msgstr " "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2465,14 -2566,14 +2592,14 @@@ msgstr " "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@@ -2574,3 -2675,57 +2701,57 @@@ msgstr "레코드 %i개를 파일 %i개 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s 파일을 여는 중입니다" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s 파일을 여는 중입니다" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "설정 파일 %s 파일을 여는 중입니다" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "%s에 연결하는 중입니다" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " 설치: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s 파일을 여는 중입니다" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "추천" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "연결이 너무 빨리 끊어졌습니다" diff --cc po/nb.po index ad66a1e9f,cad2d40c4..5fda21abf --- a/po/nb.po +++ b/po/nb.po @@@ -19,7 -19,7 +19,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@@ -161,8 -161,8 +161,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" @@@ -304,7 -320,7 +320,7 @@@ msgstr " " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@@ -633,79 -649,79 +649,79 @@@ msgstr "Problem ved oppheving av lenke msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "men %s er installert" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "men lar seg ikke installere" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "men er ikke installert" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " eller" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -714,123 -730,145 +730,145 @@@ msgstr " "ADVARSEL: Følgende kjernepakker vil bli fjernet\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Retter på avhengighetsforhold ..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " mislyktes." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Klarer ikke å rette på avhengighetsforholdene" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke å minimere oppgraderingsettet" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Utført" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installer disse pakkene uten verifikasjon [j/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges å fjernes, men funksjonen er slått av." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Det oppsto en intern feil når avledningen ble lagt til" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må hente %sB/%sB med arkiver.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må hente %sB med arkiver.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Du har ikke nok ledig plass i %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, gjør som jeg sier!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -841,28 -879,28 +879,28 @@@ msgstr " "For å fortsette, skriv: «%s»\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Avbryter." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -870,48 -908,48 +908,48 @@@ msgstr " "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " "«--fix-missing»." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og bytte av media støttes nå ikke" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Klarer ikke å rette på manglende pakker." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Avbryter istallasjonen." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, velger %s istedenfor %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installert]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Du må velge en pakke som skal installeres." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -922,49 -960,49 +960,49 @@@ msgstr " "Dette kan bety at pakken mangler, er utgått, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Følgende pakker erstatter den imidlertid:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installasjonskandidat" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave «%s» av «%s» ble ikke funnet" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon «%s» av «%s» ble ikke funnet" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kan ikke låse listemappa" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -972,25 -1010,25 +1010,44 @@@ msgstr " "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Intern feil - «AllUpgrade» ødela noe" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -998,7 -1036,7 +1055,7 @@@ msgstr " "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1010,7 -1048,7 +1067,7 @@@ msgstr " "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1020,112 -1058,122 +1077,118 @@@ msgstr " "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en " "feilmelding." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Ødelagte pakker" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Anbefalte pakker" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislyktes" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Utført" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Intern feil - «AllUpgrade» ødela noe" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Du må angi minst en pakke du vil ha kildekoden til" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Barneprosessen mislyktes" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1134,32 -1182,32 +1197,32 @@@ msgstr " "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Støttede moduler:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1466,8 -1514,8 +1529,9 @@@ msgstr "Skriver over pakketreff uten ve msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke å lese %s" @@@ -1498,9 -1546,9 +1562,9 @@@ msgstr " "Infokatalogen og den midlertidige katalogen må være på det samme filsystemet" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Leser pakkelister" @@@ -2214,18 -2302,18 +2318,28 @@@ msgstr "valgfri msgid "extra" msgstr "tillegg" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Skaper oversikt over avhengighetsforhold" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versjons-kandidater" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Fletter tilgjengelig informasjon" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Klarte ikke å skrive fila %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2236,52 -2324,52 +2350,52 @@@ msgstr "Klarer ikke å fortolke pakkefil msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil på %lu i kildelista %s (Absolutt dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil på %lu i kildelista %s (dist fortolking)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Åpner %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil på %u i kildelista %s (selgers id)" @@@ -2302,14 -2390,14 +2416,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Oversiktsfil av typen «%s» støttes ikke" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2317,7 -2405,7 +2431,7 @@@ msgstr " "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." @@@ -2341,12 -2434,20 +2460,20 @@@ msgstr "Finner ikke metode-driveren %s. msgid "Method %s did not start correctly" msgstr "Metoden %s startet ikke korrekt" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Bytte av media: sett inn CD-en som er merket\n" + " «%s»\n" + "i «%s» og trykk «Enter»\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» støttes ikke" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" @@@ -2382,82 -2483,82 +2509,82 @@@ msgstr "Forsto ikke spikring av typen % msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Lageret har et uoverensstemmende versjonssystem" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil oppsto under behandling av %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil oppsto under behandling av %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil oppsto under behandling av %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil oppsto under behandling av %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil oppsto under behandling av %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil oppsto under behandling av %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil oppsto under behandling av %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jøss, du har overgått antallet versjoner denne APT klarer." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil oppsto under behandling av %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil oppsto under behandling av %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" @@@ -2466,7 -2567,7 +2593,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke å endre navnet, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" @@@ -2479,7 -2580,7 +2606,7 @@@ msgstr " "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2488,13 -2589,13 +2615,13 @@@ msgstr " "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne " "pakken selv." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Feil størrelse" @@@ -2597,5 -2698,59 +2724,59 @@@ msgstr "Skrev %i poster med %i feile fi msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Åpner %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Åpner %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Åpner oppsettsfila %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Kobler til %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Installert: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Åpner %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Anbefaler" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Forbindelsen ble uventet stengt" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukjent selger ID «%s» i linje %u i kildelista %s" diff --cc po/nl.po index 48a2801f4,c5cb71693..27cafaca9 --- a/po/nl.po +++ b/po/nl.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" @@@ -290,7 -306,7 +306,7 @@@ msgstr " " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@@ -623,79 -639,79 +639,79 @@@ msgstr "Probleem bij het ontlinken van msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " of" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (wegens %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -704,123 -720,145 +720,145 @@@ msgstr " "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden\n" "Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten geïnstalleerd, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Vereisten worden verbeterd..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " mislukt." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet verbeteren" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Klaar" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthenticeerd worden" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Interne fout bij het toevoegen van een omleiding" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "U heeft niet voldoende vrije schijfruimte op %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft niet voldoende vrije schijfruimte op %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -831,28 -869,28 +869,28 @@@ msgstr " "Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Afbreken." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -860,49 -898,49 +898,49 @@@ msgstr " "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Installatie wordt afgebroken." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " "gevraagd.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Geïnstalleerd]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "U dient er één expliciet te selecteren voor installatie." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -913,50 -951,50 +951,50 @@@ msgstr " "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakket %s heeft geen installeerbare kandidaat" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -964,27 -1002,27 +1002,46 @@@ msgstr " "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "De volgende informatie helpt u mogelijk verder:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -992,7 -1030,7 +1049,7 @@@ msgstr " "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1003,7 -1041,7 +1060,7 @@@ msgstr " "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1013,109 -1051,119 +1070,115 @@@ msgstr " "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "De volgende informatie helpt u mogelijk verder:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Niet-werkende pakketten:" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukt" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Klaar" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald " "moetworden" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Dochterproces is mislukt" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1124,7 -1172,7 +1187,7 @@@ msgstr " "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1133,32 -1181,32 +1196,32 @@@ msgstr " "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Ondersteunde modules:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1474,8 -1522,8 +1537,9 @@@ msgstr "Pakket-overeenkomst wordt overs msgid "File %s/%s overwrites the one in the package %s" msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@@ -1506,9 -1554,9 +1570,9 @@@ msgstr " "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" @@@ -2232,18 -2320,18 +2336,28 @@@ msgstr "optioneel msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Boom van vereisten wordt opgebouwd" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidaat-versies" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generatie vereisten" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "De beschikbare informatie wordt samengevoegd" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Wegschrijven van bestand %s is mislukt" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2254,52 -2342,52 +2368,52 @@@ msgstr "Kon pakketbestand %s niet ontle msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Type '%s' is onbekend op regel %u in bronlijst %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" @@@ -2321,7 -2409,7 +2435,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexbestandtype '%s' wordt niet ondersteund" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2329,7 -2417,7 +2443,7 @@@ msgstr " "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " "gevonden worden." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2337,7 -2425,7 +2451,7 @@@ msgstr " "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt niet-werkende pakketten vast." @@@ -2361,12 -2454,20 +2480,20 @@@ msgstr "Het methodestuurprogramma %s ko msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Medium wisselen: Gelieve de schijf met label\n" + " '%s'\n" + "in het station '%s' te plaatsen en op 'enter' te drukken\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" @@@ -2404,84 -2505,84 +2531,84 @@@ msgstr "Pintype %s wordt niet begrepen msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cache heeft een niet-compatibel versienummeringssysteem" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fout tijdens verwerken van %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fout tijdens verwerken van %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fout tijdens verwerken van %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fout tijdens verwerken van %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fout tijdens verwerken van %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fout tijdens verwerken van %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wauw, u heeft meer pakketten dan deze APT aankan." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wauw, u heeft meer versies dan deze APT aankan." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fout tijdens verwerken van %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fout tijdens verwerken van %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" @@@ -2490,7 -2591,7 +2617,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" @@@ -2503,7 -2604,7 +2630,7 @@@ msgstr " "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2512,7 -2613,7 +2639,7 @@@ msgstr " "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2520,7 -2621,7 +2647,7 @@@ msgstr " "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@@ -2625,5 -2726,59 +2752,59 @@@ msgstr " "%i records weggeschreven met %i missende bestanden en %i niet overeenkomende " "bestanden\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s wordt geopend" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s wordt geopend" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Configuratiebestand %s wordt geopend" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Er wordt verbinding gemaakt met %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Geïnstalleerd: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s wordt geopend" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Aanbevelingen" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Verbinding werd voortijdig afgebroken" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Onbekende verkopers-ID '%s' op regel %u in bronlijst %s" diff --cc po/nn.po index 6bd23e0f9,16e47203b..0592a20bd --- a/po/nn.po +++ b/po/nn.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@@ -150,8 -150,8 +150,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" @@@ -291,7 -307,7 +307,7 @@@ msgstr " " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@@ -617,79 -633,79 +633,79 @@@ msgstr "Problem ved oppheving av lenkj msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet på %s til %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Følgjande pakkar har krav som ikkje er oppfylte:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "men %s er installert" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "men lèt seg ikkje installera" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "men er ikkje installert" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " eller" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Dei følgjande NYE pakkane vil verta installerte:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Dei følgjande pakkane vil verta FJERNA:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Dei følgjande pakkane er haldne tilbake:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Dei følgjande pakkane vil verta oppgraderte:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -698,124 -714,146 +714,146 @@@ msgstr " "ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n" "Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte på nytt, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Rettar på krav ..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " mislukkast." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta på krav" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Ferdig" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane." - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installer desse pakkane utan verifikasjon [j/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar må fjernast, men fjerning er slått av." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Intern feil ved tilleggjing av avleiing" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Klarte ikkje låsa nedlastingskatalogen" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må henta %sB/%sB med arkiv.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må henta %sB med arkiv.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Du har ikkje nok ledig plass i %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -826,28 -864,28 +864,28 @@@ msgstr " "For å halda fram, må du skriva nøyaktig «%s».\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Avbryt." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -855,49 -893,49 +893,49 @@@ msgstr " "Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller " "«--fix-missing»." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Avbryt installasjon." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, vel %s i staden for %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert frå før og ikkje sett til " "oppgradering.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installert]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Du må velja ein som skal installerast." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -908,49 -946,49 +946,49 @@@ msgstr " "av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n" "eller er berre tilgjengeleg frå ei anna kjelde\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Dei følgjande pakkane kan brukast i staden:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert frå før.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgåva «%s» av «%s»" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen «%s» av «%s»" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Klarte ikkje låsa listekatalogen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -958,26 -996,26 +996,45 @@@ msgstr " "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Intern feil. AllUpgrade øydelagde noko" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex «%s»\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -985,7 -1023,7 +1042,7 @@@ msgstr " "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja " "ei løysing)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -997,7 -1035,7 +1054,7 @@@ msgstr " "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i «Incoming»." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1007,112 -1045,122 +1064,118 @@@ msgstr " "pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n" "feilmelding." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Øydelagde pakkar" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Føreslåtte pakkar:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Tilrådde pakkar" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukkast" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Ferdig" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Intern feil. AllUpgrade øydelagde noko" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Må henta %sB med kjeldekodearkiv.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislukkast.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen «%s» mislukkast.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Barneprosessen mislukkast" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1121,31 -1169,31 +1184,31 @@@ msgstr " "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Støtta modular:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1450,8 -1498,8 +1513,9 @@@ msgstr "Skriv over pakketreff utan vers msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@@ -1482,9 -1530,9 +1546,9 @@@ msgstr " "Infokatalogen og den mellombelse katalogen må vera på det same filsystemet" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Les pakkelister" @@@ -2197,18 -2285,18 +2301,28 @@@ msgstr "valfri msgid "extra" msgstr "tillegg" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Byggjer kravtre" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidatversjonar" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Genererer kravforhold" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Flettar informasjon om tilgjengelege pakkar" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Klarte ikkje skriva fila %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2219,52 -2307,52 +2333,52 @@@ msgstr "Klarte ikkje tolka pakkefila % msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Opnar %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" @@@ -2286,13 -2374,13 +2400,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indeksfiltypen «%s» er ikkje støtta" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s må installerast på nytt, men arkivet finst ikkje." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2300,7 -2388,7 +2414,7 @@@ msgstr " "Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake." @@@ -2325,12 -2418,20 +2444,20 @@@ msgstr "Finn ikkje metodedrivaren %s. msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Skifte av medum: Set inn plata merkt\n" + " «%s»\n" + "i stasjonen «%s» og trykk Enter.\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» er ikkje støtta" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" @@@ -2365,82 -2466,82 +2492,82 @@@ msgstr "Skjønar ikkje spikringstypen %s msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil ved behandling av %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil ved behandling av %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil ved behandling av %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil ved behandling av %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil ved behandling av %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil ved behandling av %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil ved behandling av %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jøss, du har overgått talet på pakkenamn som APT kan handtera." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått talet på krav som APT kan handtera." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil ved behandling av %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil ved behandling av %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje få status på kjeldepakkelista %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" @@@ -2449,7 -2550,7 +2576,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" @@@ -2462,7 -2563,7 +2589,7 @@@ msgstr " "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv " "(fordi arkitekturen manglar)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2470,14 -2571,14 +2597,14 @@@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Feil storleik" @@@ -2580,5 -2681,59 +2707,59 @@@ msgstr "Skreiv %i postar med %i filer s msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Opnar %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Opnar %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Opnar oppsettsfila %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Koplar til %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Installert: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Opnar %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Tilrådingar" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Sambandet vart uventa stengd" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukjend utgjevar-ID «%s» i linja %u i kjeldelista %s" diff --cc po/pl.po index be2659af4,936c6e99c..d48bd09fd --- a/po/pl.po +++ b/po/pl.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" @@@ -291,7 -307,7 +307,7 @@@ msgstr " " -c=? Czytaj ten plik konfiguracyjny.\n" " -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Nie uda³o siê pisaæ do %s" @@@ -620,79 -636,79 +636,79 @@@ msgstr "Problem przy usuwaniu %s msgid "Failed to rename %s to %s" msgstr "Nie uda³o siê zmieniæ nazwy %s na %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "T" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "B³±d kompilacji wyra¿enia regularnego - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostaæ zainstalowany" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ale nie da siê go zainstalowaæ" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " lub" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Zostan± zainstalowane nastêpuj±ce NOWE pakiety:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Nastêpuj±ce pakiety zostan± USUNIÊTE:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Nastêpuj±ce pakiety zosta³y zatrzymane:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Nastêpuj±ce pakiety zostan± zaktualizowane:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Zostan± zainstalowane STARE wersje nastêpuj±cych pakietów:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Zostan± zmienione nastêpuj±ce zatrzymane pakiety:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -701,122 -717,144 +717,144 @@@ msgstr " "UWAGA: Zostan± usuniête nastêpuj±ce istotne pakiety\n" "Nie powinno siê tego robiæ, chyba ¿e dok³adnie wiesz, co robisz!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu przeinstalowywanych, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniêtych wersji, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pe³ni zainstalowanych lub usuniêtych.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Naprawianie zale¿no¶ci..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " nie uda³o siê." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Nie uda³o siê naprawiæ zale¿no¶ci" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Nie uda³o siê zminimalizowaæ zbioru aktualizacji" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Gotowe" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Niespe³nione zale¿no¶ci. Spróbuj u¿yæ -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Nastêpuj±ce pakiety nie mog± zostaæ zweryfikowane!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Zainstalowaæ te pakiety bez weryfikacji [t/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Niektóre pakiety nie mog³y zostaæ zweryfikowane" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "By³y problemy, a u¿yto -y bez --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zostaæ usuniête, ale Remove jest wy³±czone." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "B³±d wewnêtrzny przy dodawaniu objazdu" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Nie uda³o siê zablokowaæ katalogu pobierania" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nie uda³o siê odczytaæ list ¼róde³." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiwów.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozpakowaniu zostanie dodatkowo u¿yte %sB miejsca na dysku.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywaæ tylko trywialne operacje, a to nie jest trywialne." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Tak, rób jak mówiê!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -827,28 -865,28 +865,28 @@@ msgstr " "Aby kontynuowaæ wpisz zdanie '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Przerwane." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowaæ [T/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie uda³o siê pobraæ %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Nie uda³o siê pobraæ niektórych plików" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Ukoñczono pobieranie w trybie samego pobierania" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -856,48 -894,48 +894,48 @@@ msgstr " "Nie uda³o siê pobraæ niektórych archiwów, spróbuj uruchomiæ apt-get update " "lub u¿yæ opcji --fix-missing" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamienianie no¶ników nie jest obecnie obs³ugiwane" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Nie uda³o siê poprawiæ brakuj±cych pakietów." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Przerywanie instalacji" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Uwaga, wybieranie %s zamiast %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Pomijanie %s, jest ju¿ zainstalowane, a nie zosta³o wybrana aktualizacja.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakiet %s nie jest zainstalowany, wiêc nie zostanie usuniêty.\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Zainstalowany]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Nale¿y jednoznacznie wybraæ jeden z nich do instalacji." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -908,50 -946,50 +946,50 @@@ msgstr " "Zazwyczaj oznacza to, ¿e pakietu brakuje, zosta³ zast±piony przez inny\n" "pakiet lub nie jest dostêpny przy pomocy obecnie ustawionych ¼róde³.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Jednak nastêpuj±ce pakiety go zastêpuj±:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Przeinstalowanie pakietu %s nie jest mo¿liwe, nie mo¿e on zostaæ pobrany.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jest ju¿ w najnowszej wersji.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie '%s' dla '%s' nie zosta³o znalezione" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja '%s' dla '%s' nie zosta³a znaleziona" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersjê %s (%s) dla %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga ¿adnych argumentów" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Nie uda³o siê zablokowaæ katalogu list" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -959,25 -997,25 +997,44 @@@ msgstr " "Nie uda³o siê pobraæ niektórych plików indeksu, zosta³y one zignorowane lub " "zosta³a u¿yta ich starsza wersja." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Nie uda³o siê odnale¼æ pakietu %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyra¿enie '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -985,7 -1023,7 +1042,7 @@@ msgstr " "Niespe³nione zale¿no¶ci. Spróbuj 'apt-get -f install' bez pakietów (lub " "podaj rozwi±zanie)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -997,7 -1035,7 +1054,7 @@@ msgstr " "niestabilnej, w której niektóre pakiety nie zosta³y jeszcze utworzone\n" "lub przeniesione z katalogu Incoming (\"Przychodz±ce\")." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1007,110 -1045,120 +1064,116 @@@ msgstr " "danego pakietu po prostu nie da siê zainstalowaæ i nale¿y zg³osiæ w nim\n" "b³±d." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pakiety s± b³êdne" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Polecane pakiety:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Nie uda³o siê" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Gotowe" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pobrane " "¼ród³a" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie uda³o siê odnale¼æ ¼ród³a dla pakietu %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów ¼róde³.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów ¼róde³.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz ¼ród³o %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Nie uda³o siê pobraæ niektórych archiwów." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju¿ rozpakowanego ¼ród³a w %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiod³o.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiod³o.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Proces potomny zawiód³" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pakiety " "wymagane do budowania" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie uda³o siê pobraæ informacji o zale¿no¶ciach na czas budowania dla %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zale¿no¶ci czasu budowania.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1119,7 -1167,7 +1182,7 @@@ msgstr " "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ nie znaleziono " "pakietu %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1128,32 -1176,32 +1191,32 @@@ msgstr " "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ ¿adna z dostêpnych " "wersji pakietu %s nie ma odpowiedniej wersji" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie uda³o siê spe³niæ zale¿no¶ci na czas budowania od %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Nie uda³o siê przetworzyæ zale¿no¶ci na czas budowania" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Obs³ugiwane modu³y:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1462,8 -1510,8 +1525,9 @@@ msgstr "Dopasowanie dla %s nadpisuj±ceg msgid "File %s/%s overwrites the one in the package %s" msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nie mo¿na czytaæ %s" @@@ -1493,9 -1541,9 +1557,9 @@@ msgid "The info and temp directories ne msgstr "Pliki info i temp musz± byæ na tym samym systemie plików" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Czytanie list pakietów" @@@ -2208,18 -2296,18 +2312,28 @@@ msgstr "opcjonalny msgid "extra" msgstr "dodatkowy" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Budowanie drzewa zale¿no¶ci" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandyduj±ce wersje" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generowanie zale¿no¶ci" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "£±czenie informacji o dostêpnych pakietach" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Nie uda³o siê zapisaæ pliku %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2230,52 -2318,52 +2344,52 @@@ msgstr "Nie uda³o siê zanalizowaæ plik msgid "Unable to parse package file %s (2)" msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (dystrybucja)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (analiza URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (bezwzglêdna dystrybucja)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (analiza dystrybucji)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w li¶cie ¼róde³ %s jest zbyt d³uga." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (typ)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' jest nieznany - linia %u listy ¼róde³ %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (identyfikator producenta)" @@@ -2297,14 -2385,14 +2411,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Plik indeksu typu '%s' nie jest obs³ugiwany" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakiet %s ma zostaæ przeinstalowany, ale nie mo¿na znale¼æ jego archiwum." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2312,7 -2400,7 +2426,7 @@@ msgstr " "B³±d, pkgProblemResolver::Resolve zwróci³ b³±d, mo¿e to byæ spowodowane " "\"zatrzymanymi\" pakietami." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie uda³o siê naprawiæ problemów, zatrzyma³e¶/³a¶ uszkodzone pakiety." @@@ -2336,12 -2429,20 +2455,20 @@@ msgstr "Nie uda³o siê odnale¼æ sterowni msgid "Method %s did not start correctly" msgstr "Metoda %s nie uruchomi³a siê poprawnie." - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Zmiana no¶nika: Proszê w³o¿yæ dysk oznaczony\n" + " '%s'\n" + "do napêdu '%s' i nacisn±æ enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietów '%s' nie jest obs³ugiwany" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nie uda³o siê okre¶liæ odpowiedniego typu systemu pakietów" @@@ -2375,87 -2476,87 +2502,87 @@@ msgstr "Nierozpoznany typ przypinania % msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypiêcia" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Magazyn podrêczny ma niezgodny system wersji" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Och, przekroczy³e¶/³a¶ liczbê pakietów, któr± ten APT jest w stanie obs³u¿yæ." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Och, przekroczy³e¶/³a¶ liczbê wersji, któr± ten APT jest w stanie obs³u¿yæ." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Och, przekroczy³e¶/³a¶ liczbê zale¿no¶ci, któr± ten APT jest w stanie " "obs³u¿yæ." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie zosta³ odnaleziony przy przetwarzaniu zale¿no¶ci plików" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie uda³o siê wykonaæ operacji stat na li¶cie pakietów ¼ród³owych %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Zbieranie zapewnieñ plików" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "B³±d wej¶cia/wyj¶cia przy zapisywaniu podrêcznego magazynu ¼róde³" @@@ -2464,7 -2565,7 +2591,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "B³êdna suma MD5" @@@ -2477,7 -2578,7 +2604,7 @@@ msgstr " "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba " "bêdzie rêcznie naprawiæ ten pakiet (z powodu brakuj±cej architektury)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2486,14 -2587,14 +2613,14 @@@ msgstr " "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba " "bêdzie rêcznie naprawiæ ten pakiet." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów s± uszkodzone. Brak pola Filename: dla pakietu %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "B³êdny rozmiar" @@@ -2596,3 -2697,57 +2723,57 @@@ msgstr "Zapisano %i rekordów z %i niepa #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordów z %i brakuj±cymi plikami i %i niepasuj±cymi\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Otwieranie %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Otwieranie %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Otwieranie pliku konfiguracyjnego %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "£±czenie z %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Zainstalowana: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Otwieranie %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Poleca" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Po³±czenie zosta³o zamkniête przedwcze¶nie" diff --cc po/pt.po index 84bc5b49d,68a6d730a..26045ff17 --- a/po/pt.po +++ b/po/pt.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@@ -289,7 -304,7 +304,7 @@@ msgstr " " -c=? Ler este arquivo de configuração\n" " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@@ -616,79 -631,79 +631,79 @@@ msgstr "Problema ao executar unlinking msgid "Failed to rename %s to %s" msgstr "Falha ao renomear %s para %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "mas não está instalável" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "mas não está instalado" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ou" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Os seguintes NOVOS pacotes serão instalados:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Os seguintes pacotes serão REMOVIDOS:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Os seguintes pacotes serão actualizados:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Aos seguintes pacotes será feito o DOWNGRADE :" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados :" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -698,123 -713,145 +713,145 @@@ msgstr " "Isso NÃO deve ser feito a menos que você saiba exactamente o que está a " "fazer!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " falhou." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de actualizações" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Feito" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não poderam ser autenticados" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Erro Interno ao adicionar um desvio" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É necessário fazer o download de %sB de arquivos.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois descompactar, %sB adicionais de espaço em disco serão utilizados.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Desculpe, você não tem espaço suficiente em %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas essa não é uma operação trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -825,28 -862,28 +862,28 @@@ msgstr " "Para continuar escreva a frase '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abortado." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -854,47 -891,47 +891,47 @@@ msgstr " "Impossível obter alguns arquivos, execute talvez apt-get update ou tente com " "--fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Impossível corrigir os pacotes em falta." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abortando a Instalação." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s em vez de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalado]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Você deve selecionar explicitamente um para instalar." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -905,51 -942,51 +942,51 @@@ msgstr " "Isso pode significar que o pacote falta, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "No entanto, os seguintes pacotes substituem-o:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais recente.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrado" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -957,25 -994,25 +994,44 @@@ msgstr " "Falhou o download de alguns ficheiros de índice, foram ignorados ou os " "antigos foram usados em seu lugar." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "A seguinte informação pode ajudar a resolver a situação:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Erro Interno, AllUpgrade quebrou as coisas" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -983,7 -1020,7 +1039,7 @@@ msgstr " "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -995,7 -1032,7 +1051,7 @@@ msgstr " "distribuição instável, que alguns pacotes requesitados ainda não foram \n" "criados ou foram tirados do Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1006,109 -1043,119 +1062,115 @@@ msgstr " "de\n" "bug sobre esse pacote." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "A seguinte informação pode ajudar a resolver a situação:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pacotes estragados" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Pacotes recomendados :" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Pronto" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Erro Interno, AllUpgrade quebrou as coisas" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos de código fonte.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "O processo filho falhou" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível obter informações de dependências de compilação para %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1117,7 -1164,7 +1179,7 @@@ msgstr " "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1126,32 -1173,32 +1188,32 @@@ msgstr " "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requesitos de versão" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Módulos Suportados:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1461,8 -1508,8 +1523,9 @@@ msgstr "Sobreescrita de pacote não coi msgid "File %s/%s overwrites the one in the package %s" msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@@ -1492,9 -1539,9 +1555,9 @@@ msgid "The info and temp directories ne msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "A Ler Listas de Pacotes" @@@ -2207,18 -2294,18 +2310,28 @@@ msgstr "opcional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versões Candidatas" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Geração de Dependência" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Juntando informação Disponível" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Falha ao escrever ficheiro %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2229,52 -2316,52 +2342,52 @@@ msgstr "Impossível o parse ao ficheir msgid "Unable to parse package file %s (2)" msgstr "Impossível o parse ao ficheiro de pacote %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu na lista de fontes %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu na lista de fontes %s (Distribuição absoluta)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@@ -2296,7 -2383,7 +2409,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Tipo do ficheiro de índice '%s' não é suportado" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2304,7 -2391,7 +2417,7 @@@ msgstr " "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2312,7 -2399,7 +2425,7 @@@ msgstr " "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados." @@@ -2336,12 -2428,20 +2454,20 @@@ msgstr "O driver do método %s não pô msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Troca de mídia: Por favor insira o disco chamado\n" + " '%s'\n" + "na drive '%s' e pressione enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável" @@@ -2378,87 -2478,87 +2504,87 @@@ msgstr "Não foi possível entender o t msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para marcação" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "A Cache possui um sistema de versões incompatível" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu ao processar %s (NovoPacote)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu ao processar %s (UsePacote1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu ao processar %s (UsePacote2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu ao processar %s (UsePacote3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu ao processar %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Obtendo File Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" @@@ -2467,7 -2567,7 +2593,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" @@@ -2481,7 -2581,7 +2607,7 @@@ msgstr " "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2490,7 -2590,7 +2616,7 @@@ msgstr " "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2498,7 -2598,7 +2624,7 @@@ msgstr " "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamanho incorreto" @@@ -2603,6 -2703,60 +2729,60 @@@ msgstr " "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Abrindo ficheiro de configuração %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Ligando a %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalado: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomenda" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Conexão encerrada prematuramente" + #~ msgid "The pkg cache must be initialize first" #~ msgstr "A cache de pacotes deve ser inicializada primeiro" diff --cc po/pt_BR.po index 968259925,6f28b8a77..9a4c91244 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@@ -291,7 -306,7 +306,7 @@@ msgstr " " -c=? Ler esse arquivo de configuração\n" " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@@ -618,79 -633,79 +633,79 @@@ msgstr "Problema executando unlinking % msgid "Failed to rename %s to %s" msgstr "Falha ao renomear %s para %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "mas não está instalável" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "mas não está instalado" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ou" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais :" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados :" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REBAIXADOS de versão :" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Os pacotes segurados a seguir serão mudados :" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -699,123 -714,145 +714,145 @@@ msgstr " "AVISO: Os pacotes essenciais a seguir serão removidos\n" "Isso NÃO deve ser feito a menos que você saiba exatamente o que está fazendo!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu desatualizados, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " falhou." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de atualizações" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Pronto" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer rodar `apt-get -f install' para corrigir isso." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dependências desencontradas. Tente usar -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO : Os pacotes a seguir não podem ser autenticados !" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [s/N] ? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Erro Interno ao adicionar um desvio" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no diretório de download" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É preciso fazer o download de %sB/%sB de arquivos.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É preciso fazer o download de %sB de arquivos.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois de desempacotamento, %sB adicionais de espaço em disco serão usados.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Desculpe, você não tem espaço suficiente em %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço suficiente em %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Triviais Apenas especificado mas essa não é uma operação trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Sim, faça o que eu digo!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -826,28 -863,28 +863,28 @@@ msgstr " "Para continuar digite a frase '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abortado." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n] ? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao baixar %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -855,47 -892,47 +892,47 @@@ msgstr " "Impossível pegar alguns arquivos, talvez rodar apt-get update ou tentar com " "--fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados atualmente" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Impossível corrigir pacotes faltosos." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abortando Instalação." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, selecionando %s ao invés de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual provido por:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalado]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Você deve selecionar um explicitamente para instalar." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -906,51 -943,51 +943,51 @@@ msgstr " "Isso pode significar que o pacote está faltando, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "No entanto, os pacotes a seguir o substituem:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais nova.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no diretório de listas" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -958,25 -995,25 +995,44 @@@ msgstr " "Alguns arquivos de índice falharam no download, eles foram ignorados ou os " "antigos foram usados em seu lugar." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "A informação a seguir pode ajudar a resolver a situação:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Erro Interno, AllUpgrade quebrou as coisas" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer rodar `apt-get -f install' para corrigir isso:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -984,7 -1021,7 +1040,7 @@@ msgstr " "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -996,7 -1033,7 +1052,7 @@@ msgstr " "distribuição instável, que alguns pacotes requeridos não foram \n" "criados ainda ou foram tirados do Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1006,107 -1043,117 +1062,113 @@@ msgstr " "esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "A informação a seguir pode ajudar a resolver a situação:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pacotes quebrados" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Pacotes recomendados :" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calculando Atualização... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Pronto" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Erro Interno, AllUpgrade quebrou as coisas" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Obter Fonte %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Falha ao fazer o download de alguns arquivos." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando desempacotamento de pacote fonte já desempacotado em %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Processo filho falhou" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1115,7 -1162,7 +1177,7 @@@ msgstr " "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1124,32 -1171,32 +1186,32 @@@ msgstr " "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência %s para %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Módulos Suportados:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1458,8 -1505,8 +1520,9 @@@ msgstr "Sobreescrita de pacote não cas msgid "File %s/%s overwrites the one in the package %s" msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@@ -1489,9 -1536,9 +1552,9 @@@ msgid "The info and temp directories ne msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Lendo Lista de Pacotes" @@@ -2207,18 -2294,18 +2310,28 @@@ msgstr "opcional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versões Candidatas" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Geração de Dependência" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Mesclando informação Disponível" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Falha ao gravar arquivo %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2229,52 -2316,52 +2342,52 @@@ msgstr "Impossível analizar arquivo de msgid "Unable to parse package file %s (2)" msgstr "Impossível analizar arquivo de pacote %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu no arquivo de fontes %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu no arquivo de fontes %s (distribuição)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu no arquivo de fontes %s (análise de URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu no arquivo de fontes %s (Distribuição absoluta)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu no arquivo de fontes %s (análise de distribuição)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na sources.lits %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u no arquivo de fontes %s (tipo)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@@ -2296,7 -2383,7 +2409,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Tipo de arquivo de índice '%s' não é suportado" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2304,7 -2391,7 +2417,7 @@@ msgstr " "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2312,7 -2399,7 +2425,7 @@@ msgstr " "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." @@@ -2336,12 -2428,20 +2454,20 @@@ msgstr "O driver do método %s não pôde msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Troca de mídia: Por favor insira o disco nomeado\n" + " '%s'\n" + "no drive '%s' e pressione enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável." @@@ -2379,86 -2479,86 +2505,86 @@@ msgstr "Naõ foi possível entender o tip msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para pinagem" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "O Cache possui um sistema de versões incompatível" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVersão1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVersão2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Ops, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Ops, você excedeu o número de versões que este APT é capaz de suportar." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Ops, você excedeu o número de dependências que este APT é capaz de suportar." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pacote %s %s não foi encontrado processando dependências de arquivo" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível checar a lista de pacotes fonte %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Coletando File Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar cache fonte" @@@ -2467,7 -2567,7 +2593,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" @@@ -2481,7 -2581,7 +2607,7 @@@ msgstr " "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2490,7 -2590,7 +2616,7 @@@ msgstr " "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2498,7 -2598,7 +2624,7 @@@ msgstr " "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamanho incorreto" @@@ -2605,6 -2705,60 +2731,60 @@@ msgstr " "Gravados %i registros com %i arquivos faltando e %i arquivos que não " "combinam\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Abrindo arquivo de configuração %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Conectando a %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalado: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomenda" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Conexão encerrada prematuramente" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s" diff --cc po/ro.po index 30546b718,9d1e7b34c..a2dfe7ce0 --- a/po/ro.po +++ b/po/ro.po @@@ -4,12 -4,12 +4,12 @@@ # msgid "" msgstr "" -"Project-Id-Version: apt_po_ro\n" +"Project-Id-Version: apt_ro\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-08-25 17:43+0300\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2004-11-16 01:22+0200\n" "Last-Translator: Sorin Batariuc \n" -"Language-Team: Romanian \n" +"Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" @@@ -290,7 -306,7 +306,7 @@@ msgstr " " -c=? Citeşte acest fişier de configurare\n" " -o=? Ajustează o opÅ£iune de configurare arbitrară, ex. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Nu pot scrie în %s" @@@ -299,32 -315,31 +315,32 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nu pot citi versiunea debconf. Este instalat debconf?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Lista de extensii pentru pachet este prea lungă" +msgstr "Lista extensiei pachetului este prea lungă" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Eroare la prelucrarea directorului %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "Lista de extensii pentru sursă este prea lungă" +msgstr "Lista extensiei sursei este prea lungă" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Eroare la scrierea antetului în fişierul index" +msgstr "Eroare la scrierea antetului în conÅ£inutul fişierului" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Eroare la prelucrarea conÅ£inutului %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -505,13 -520,13 +521,13 @@@ msgstr "Eşuare în desfacerea legătur msgid "*** Failed to link %s to %s" msgstr "*** Eşuare în legarea %s de %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " Limita de %sB a dezlegării a fost atinsă.\n" +msgstr " Atinsă limita de %sB a dezlegării.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Eşuare în determinarea stării %s" @@@ -625,79 -640,79 +641,79 @@@ msgstr "Problemă la desfacerea %s msgid "Failed to rename %s to %s" msgstr "Eşuare în a redenumi %s în %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" -msgstr "Eroare de compilare expresie regulată - %s" +msgstr "Eroare de compilare regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependenÅ£e neîndeplinite:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "dar nu este instalabil" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "dar nu este instalat" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " sau" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ŞTERSE:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reÅ£inute:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Următoarele pachete Å£inute vor fi schimbate:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -706,124 -721,145 +722,146 @@@ msgstr " "AVERTISMENT: Următoarele pachete esenÅ£iale vor fi şterse\n" "Aceasta NU ar trebui făcută decât dacă ştiÅ£i exact ce vreÅ£i!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de şters şi %lu neînnoite.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau şterse incomplet.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Corectez dependenÅ£ele..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " eşuare." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Nu pot corecta dependenÅ£ele" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" -msgstr "Nu pot micşora mulÅ£imea pachetelor de înnoire" +msgstr "Nu pot micşora setul de înnoire" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" -msgstr " Terminat" +msgstr " Gata" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "AÅ£i putea să porniÅ£i 'apt-get -f install' pentru a corecta acestea." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." -msgstr "DependenÅ£e neîndeplinite. ÎncercaÅ£i să folosiÅ£i -f." +msgstr "DependenÅ£e neîndeplinite. ÎncercaÅ£i folosirea -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 +#, fuzzy msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" +msgstr "Următoarele pachete vor fi ÎNNOITE:" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " -msgstr "InstalaÅ£i aceste pachete fără verificare [y/N]? " +msgstr "" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" -msgstr "Unele pachete n-au putut fi autentificate" +msgstr "" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Eroare internă în timpul adăugării unei diversiuni" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB/%sB de arhive.\n" +msgstr "Este nevoie de %sB/%sB de arhive.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB de arhive.\n" +msgstr "Este nevoie de %sB de arhive.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "După despachetare va fi folosit %sB de spaÅ£iu suplimentar pe disc.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaÅ£iul de pe disc.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Nu aveÅ£i suficient spaÅ£iu în %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Nu aveÅ£i suficient spaÅ£iu în %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operaÅ£iune neimportantă." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -834,29 -870,28 +872,29 @@@ msgstr " "Pentru a continua tastaÅ£i fraza '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "RenunÅ£are." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 +#, fuzzy msgid "Do you want to continue [Y/n]? " -msgstr "VreÅ£i să continuaÅ£i [Y/n]? " +msgstr "VreÅ£i să continuaÅ£i? [Y/n] " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -864,47 -899,47 +902,47 @@@ msgstr " "Nu pot aduce unele arhive, poate porniÅ£i 'apt-get update' sau încercaÅ£i cu --" "fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abandonez instalarea." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Notă, se selectează %s în locul lui %s\n" +msgstr "Notă, selectarea %s în locul lui %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalat]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Ar trebui să alegeÅ£i în mod explicit unul pentru instalare." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -915,49 -950,49 +953,49 @@@ msgstr " "Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" -msgstr "Pachetul %s nu are nici un candidat la instalare" +msgstr "Pachetul %s nu are nici un candidat de instalare" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s este deja la cea mai nouă versiune.\n" +msgstr "%s are deja cea mai nouă versiune.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Release '%s' pentru '%s' n-a fost găsită" +msgstr "ProducÅ£ia '%s' pentru '%s' n-a fost găsită" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -965,25 -1000,25 +1003,44 @@@ msgstr " "Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " "fost folosite în loc unele vechi." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Următoarele informaÅ£ii ar putea să vă ajute la rezolvarea situaÅ£iei:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" +msgstr "Notă, selectare %s pentru regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "AÅ£i putea porni 'apt-get -f install' pentru a corecta acestea:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -991,7 -1026,7 +1048,7 @@@ msgstr " "DependenÅ£e neîndeplinite. ÎncercaÅ£i 'apt-get -f install' fără nici un pachet " "(sau oferiÅ£i o altă soluÅ£ie)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1004,7 -1039,7 +1061,7 @@@ msgstr " "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1014,107 -1049,117 +1071,113 @@@ msgstr " " că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n" "acest pachet ar trebui completat." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Următoarele informaÅ£ii ar putea să vă ajute la rezolvarea situaÅ£iei:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pachete deteriorate" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Pachete sugerate:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Pachete recomandate:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Eşuare" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" -msgstr "Terminat" +msgstr "Gata" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puÅ£in un pachet pentru a-i aduce sursa" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveÅ£i suficient spaÅ£iu în %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB/%sB din arhivele surselor.\n" +msgstr "Este nevoie de %sB/%sB din arhivele surselor.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB din arhivele surselor.\n" +msgstr "Este nevoie de %sB din arhivele surselor.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Eşuare proces copil" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puÅ£in un pachet pentru a-i verifica dependenÅ£ele " "înglobate" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informaÅ£iile despre dependenÅ£ele înglobate ale lui %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenÅ£e înglobate.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1123,41 -1168,41 +1186,41 @@@ msgstr " "DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" "DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " -"disponibilă a pachetului %s nu poate satisface versiunile cerute" +"disponibilă a pachetului %s nu poate satisface cererile de versiuni" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eşuare în a satisface dependenÅ£a lui %s de %s: Pachetul instalat %s este " "prea nou" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eşuare în a satisface dependenÅ£a lui %s de %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "DependenÅ£ele înglobate pentru %s nu pot fi satisfăcute." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenÅ£ele înglobate" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Module suportate:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1468,8 -1513,8 +1531,9 @@@ msgstr "Pachetul suprascris nu se potri msgid "File %s/%s overwrites the one in the package %s" msgstr "Fişierul %s/%s suprascrie pe cel din pachetul %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nu pot citi %s" @@@ -1501,9 -1546,9 +1565,9 @@@ msgstr " "fişiere" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Citire liste de pachete" @@@ -1623,12 -1669,11 +1687,12 @@@ msgstr " "Vă rog folosiÅ£i apt-cdrom pentru a face recunoscut acest CD de către APT. " "'apt-get update' nu poate fi folosit pentru adăugarea de noi CD-uri" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 +#, fuzzy msgid "Wrong CD-ROM" -msgstr "CD-ROM necorespunzător" +msgstr "CD necorespunzător" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat." @@@ -2218,18 -2303,18 +2322,28 @@@ msgstr "opÅ£ional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Se construieşte arborele de dependenţă" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versiuni candidat" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generare dependenÅ£e" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Unirea informaÅ£iilor disponibile" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Eşuare în a scrie fişierul %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2240,52 -2325,52 +2354,52 @@@ msgstr "Nu pot analiza fişierul pache msgid "Unable to parse package file %s (2)" msgstr "Nu pot analiza fişierul pachet %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greşită %lu în lista sursă %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greşită %lu în lista sursă %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greşită %lu în lista sursă %s (analiza URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greşită %lu în lista sursă %s (dist. absolută)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greşită %lu în lista sursă %s (analiza dist.)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Deschidere %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greşită %u în lista sursă %s (tip)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greşită %u în lista sursă %s (identificator vânzător)" @@@ -2307,14 -2392,14 +2421,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Tipul de fişier index '%s' nu este suportat" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2322,7 -2407,7 +2436,7 @@@ msgstr " "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete Å£inute." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, aÅ£i Å£inut pachete deteriorate." @@@ -2346,12 -2436,20 +2465,20 @@@ msgstr "Metoda driver %s nu poate fi gÄ msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Schimbare de mediu: Vă rog introduceÅ£i discul numit\n" + " '%s'\n" + "în unitatea '%s' şi apăsaÅ£i Enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nu pot determina un tip de sistem de pachete potrivit" @@@ -2388,87 -2486,87 +2515,87 @@@ msgstr "Nu s-a înÅ£eles tipul de pin % msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cache are un versioning system incompatibil" --#: apt-pkg/pkgcachegen.cc:117 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:119 +#, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Eroare în timpul procesării %s (Pachet Nou)" +msgstr "Eroare în timpul procesării %s (pachet nou)" --#: apt-pkg/pkgcachegen.cc:129 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:131 +#, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Eroare în timpul procesării %s (UsePackage1)" +msgstr "Eroare în timpul procesării %s (folosit pachet 1)" --#: apt-pkg/pkgcachegen.cc:150 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:152 +#, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Eroare în timpul procesării %s (UsePackage2)" +msgstr "Eroare în timpul procesării %s (folosit pachet 2)" --#: apt-pkg/pkgcachegen.cc:154 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:156 +#, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Eroare în timpul procesării %s (NewFileVer1)" +msgstr "Eroare în timpul procesării %s (fişier nou versiunea 1)" --#: apt-pkg/pkgcachegen.cc:184 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:186 +#, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Eroare în timpul procesării %s (NewVersion1)" +msgstr "Eroare în timpul procesării %s (versiune nouă 1)" --#: apt-pkg/pkgcachegen.cc:188 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:190 +#, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Eroare în timpul procesării %s (UsePackage3)" +msgstr "Eroare în timpul procesării %s (folosire pachet 3)" --#: apt-pkg/pkgcachegen.cc:192 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:194 +#, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Eroare în timpul procesării %s (NewVersion2)" +msgstr "Eroare în timpul procesării %s (versiune nouă 2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Mamăăă, aÅ£i depăşit numărul de nume de pachete de care este capabil acest " "APT." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Mamăăă, aÅ£i depăşit numărul de versiuni de care este capabil acest APT." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Mamăăă, aÅ£i depăşit numărul de dependenÅ£e de care este capabil acest APT." --#: apt-pkg/pkgcachegen.cc:241 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:243 +#, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Eroare în timpul procesării %s (FindPkg)" +msgstr "Eroare în timpul procesării %s (găsire pachet)" --#: apt-pkg/pkgcachegen.cc:254 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:256 +#, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Eroare în timpul procesării %s (CollectFileProvides)" +msgstr "Eroare în timpul procesării %s (colectare furnizor fişiere)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependenÅ£elor de fişiere" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" -msgstr "Colectare furnizori fişier" +msgstr "Colectare furnizori fişiere" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" @@@ -2477,7 -2575,7 +2604,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" @@@ -2488,9 -2586,9 +2615,9 @@@ msgid " "to manually fix this package. (due to missing arch)" msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " -"că aveÅ£i nevoie să reparaÅ£i manual acest pachet (din pricina unui arch lipsă)" +"că aveÅ£i nevoie să depanaÅ£i manual acest pachet (din pricina unui arch lipsă)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2499,7 -2597,7 +2626,7 @@@ msgstr " "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveÅ£i nevoie să depanaÅ£i manual acest pachet." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2507,87 -2605,88 +2634,87 @@@ msgstr " "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" #: apt-pkg/vendorlist.cc:66 -#, c-format +#, fuzzy, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Blocul vânzător %s nu conÅ£ine amprentă" +msgstr "Blocul vânzător %s este invalid" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Utilizare puct de montare CD-ROM %s\n" -"Montare CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " -msgstr "Identificare.. " +msgstr "" - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" -msgstr "Etichetă memorată: %s \n" +msgstr "" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Utilizare punct de montare CD-ROM %s\n" +msgstr "" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" -msgstr "Demontare CD-ROM\n" +msgstr "" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 +#, fuzzy msgid "Waiting for disc...\n" -msgstr "Aştept discul...\n" +msgstr "În aşteptarea antetelor" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" -msgstr "Montez CD-ROM...\n" +msgstr "" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" -msgstr "Scanez discul de fişierele index..\n" +msgstr "" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Găsite %i indexuri de pachete, %i indexuri de surse şi %i semnături\n" +msgstr "" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" -msgstr "Acesta nu este un nume valid, mai încercaÅ£i.\n" +msgstr "" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Acest disc este numit: \n" -"'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 +#, fuzzy msgid "Copying package lists..." -msgstr "Copiez listele de pachete.." +msgstr "Citire liste de pachete" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 +#, fuzzy msgid "Writing new source list\n" -msgstr "Scriere noua listă sursă\n" +msgstr "Linia %u prea lungă în lista sursă %s." - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "Intrările listei surselor pentru acest disc sunt:\n" +msgstr "" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." -msgstr "Demontez CD-ROM..." +msgstr "" #: apt-pkg/indexcopy.cc:261 #, c-format @@@ -2608,7 -2707,58 +2735,61 @@@ msgstr " #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Deschidere %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Deschidere %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Deschidere fişier de configurare %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Conectare la %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" -msgstr " Instalat: " ++msgstr " Instalate: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Deschidere %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomandă" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Conexiune închisă prematur" ++ +#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" +#~ msgstr "" +#~ "Identificator vânzător '%s' necunoscut în linia %u din lista sursă %s" diff --cc po/ru.po index 5b36cc5ef,ab3c56f22..49cf76d38 --- a/po/ru.po +++ b/po/ru.po @@@ -14,11 -10,11 +14,11 @@@ # msgid "" msgstr "" -"Project-Id-Version: apt_po_ru\n" +"Project-Id-Version: apt-ru\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-10-22 12:24+0400\n" -"Last-Translator: Yuri Kozlov \n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-02-09 19:50+0400\n" +"Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@@ -160,8 -156,8 +160,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпилирован %s %s\n" @@@ -239,6 -235,19 +239,21 @@@ msgstr " "tmp\n" "Подробности в страницах руководства apt-cache(8) и apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод." ++msgstr "" ++"Смена носителя: вставьте диск с меткой '%s' в устройство '%s' и нажмите " ++"ввод\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Непарные аргументы" @@@ -300,7 -309,7 +315,7 @@@ msgstr " " -c=? Читать указанный конфигурационный файл\n" " -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@@ -336,8 -345,7 +351,8 @@@ msgstr " msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -424,9 -430,9 +439,9 @@@ msgstr " " --contents Управление генерацией полного перечня содержимого пакетов\n" " (файла Contents)\n" " -c=? Использовать указанный конфигурационный файл\n" -" -o=? Указать произвольный параметр конфигурации" +" -o=? Указать произвольную опцию" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Совпадений не обнаружено" @@@ -640,211 -646,233 +655,233 @@@ msgstr "Не удалось ÑƒÐ´Ð°Ð»Ð¸Ñ msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "д" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "но он не может быть установлен" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "но он не установлен" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "но он не будет установлен" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " или" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" +"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Исправление зависимостей..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " не удалось." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Невозможно скорректировать зависимости" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Невозможно минимизировать набор обновлений" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Готово" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Аутентификационное предупреждение не принято в внимание.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Установить эти пакеты без проверки [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а опция -y использована без --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" -"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " -"пакетами!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Внутренняя ошибка, Ordering не завершилась" ++msgstr "Внутренняя ошибка при добавлении diversion" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org" ++msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо скачать %sB/%sB архивов.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо скачать %sБ архивов.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "После распаковки объем занятого дискового пространства возрастёт на %sB.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" "После распаковки объем занятого дискового пространства уменьшится на %sB.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Не удалось определить количество свободного места в %s" ++msgstr "Недостаточно места в %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -854,28 -882,28 +891,28 @@@ msgstr " "Чтобы продолжить, введите фразу: '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Аварийное завершение." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -883,48 -911,48 +920,48 @@@ msgstr " "Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get " "update или попытаться повторить запуск с ключом --fix-missing" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Аварийное завершение установки." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Заметьте, вместо %2$s выбирается %1$s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакет %s не установлен, поэтому не может быть удалён\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Установлен]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Вы должны явно указать, какой именно вы хотите установить." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -935,49 -963,49 +972,49 @@@ msgstr " "Это может означать, что пакет отсутствует, устарел, или доступен из " "источников, не упомянутых в sources.list\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Однако следующие пакеты могут его заменить:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакета %s не найдены кандидаты на установку" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Переустановка %s невозможна, он не загружается.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Релиз '%s' для '%s' не найден" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия '%s' для '%s' не найдена" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -985,27 -1013,27 +1022,46 @@@ msgstr " "Некоторые индексные файлы не загрузились, они были проигнорированы или " "вместо них были использованы старые версии" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Следующая информация возможно поможет Вам:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Внутренняя ошибка, AllUpgrade все поломал" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Не могу найти пакет %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1013,7 -1041,7 +1069,7 @@@ msgstr " "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1024,7 -1052,7 +1080,7 @@@ msgstr " "или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n" "ещё не созданы или были удалены из Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1034,111 -1062,120 +1090,117 @@@ msgstr " "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Следующая информация возможно поможет Вам:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Сломанные пакеты" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Настойчиво рекомендуемые пакеты:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Рассчёт обновлений... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Неудачно" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Готово" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "Внутренняя ошибка, решатель проблем всё поломал" ++msgstr "Внутренняя ошибка, AllUpgrade все поломал" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходными текстами для %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1147,7 -1184,7 +1209,7 @@@ msgstr " "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1156,32 -1193,32 +1218,32 @@@ msgstr " "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Поддерживаемые модули:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1489,8 -1526,8 +1551,9 @@@ msgstr "Файлы Ð·Ð°Ð¼ÐµÐ½ÑÑŽÑ‚ÑÑ msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s переписывает файл в пакете %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" @@@ -1520,9 -1557,9 +1583,9 @@@ msgid "The info and temp directories ne msgstr "Каталоги info и temp должны находиться на одной файловой системе" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Чтение списков пакетов" @@@ -1650,7 -1687,11 +1713,12 @@@ msgstr "Ошибочный CD msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Невозможно размонтировать CD-ROM в %s, возможно он ещё используется." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Диск не найден." ++msgstr "Файл не найден" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Файл не найден" @@@ -1875,6 -1917,47 +1944,44 @@@ msgstr " msgid "Unable to connect to %s %s:" msgstr "Невозможно соединиться с %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" -"E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение " -"работы." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " -"ключа?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Найдена как минимум одна неправильная подпись." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Не удалось выполнить " ++msgstr "Не могу получить доступ к файлу блокировки %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr "для проверки подписи (gnupg установлена?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Неизвестная ошибка при выполнении gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Следующие подписи неверные:\n" ++msgstr "Будут установлены следующие дополнительные пакеты:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -2245,18 -2324,18 +2348,28 @@@ msgstr "необязательный msgid "extra" msgstr "дополнительный" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Построение дерева зависимостей" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Версии-кандидаты" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Генерирование зависимостей" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Объединение информации о доступных пакетах" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Не удалось записать файл %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2267,53 -2346,53 +2380,53 @@@ msgstr "Невозможно проче msgid "Unable to parse package file %s (2)" msgstr "Невозможно прочесть содержимое пакета %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Открытие %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Неизвестен тип '%s' в строке %u в списке источников %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" @@@ -2335,13 -2414,13 +2448,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Не поддерживается индексный файл типа '%s'" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Пакет %s нуждается в переустановке, но я не могу найти архив для него." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2349,7 -2428,7 +2462,7 @@@ msgstr " "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у Вас отложены (held) битые пакеты." @@@ -2363,7 -2442,12 +2476,12 @@@ msgstr "Каталог %spartial отс msgid "Archive directory %spartial is missing." msgstr "Архивный каталог %spartial отсутствует." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Загружается файл %li из %li (%s осталось)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не найден." @@@ -2373,12 -2457,17 +2491,19 @@@ msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод." ++msgstr "" ++"Смена носителя: вставьте диск с меткой '%s' в устройство '%s' и нажмите " ++"ввод\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Менеджер пакетов '%s' не поддерживается" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Невозможно определить подходящий тип менеджера пакетов" @@@ -2412,82 -2501,82 +2537,82 @@@ msgstr "Неизвестный тип Ñ msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Кэш имеет несовместимую систему версий" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Произошла ошибка во время обработки %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Произошла ошибка во время обработки %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Произошла ошибка во время обработки %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Произошла ошибка во время обработки %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Произошла ошибка во время обработки %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Произошла ошибка во время обработки %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Превышено допустимое количество имён пакетов." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Превышено допустимое количество версий." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Превышено допустимое количество зависимостей." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Произошла ошибка во время обработки %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш исходных текстов" @@@ -2496,7 -2585,7 +2621,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" @@@ -2509,7 -2598,7 +2634,7 @@@ msgstr " "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет (возможно, пропущен arch)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2518,13 -2607,13 +2643,13 @@@ msgstr " "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Не совпадает размер" @@@ -2629,4 -2718,58 +2754,58 @@@ msgstr "Сохранено %i Ð·Ð°Ð¿Ð¸Ñ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " -"файлами\n" +"файлами.\n" + + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Подготавливается %s" ++msgstr "Открытие %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Распаковывается %s" ++msgstr "Открытие %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Подготавливается для конфигурации %s" ++msgstr "Открытие файла конфигурации %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Настройка %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "Установлен %s" ++msgstr " Установлен: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Подготавливается для удаления %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Удаление %s" ++msgstr "Открытие %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "Удалён %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Подготавливается для удаления вместе с настройками %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Удалён вместе с настройками %s" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Соединение закрыто преждевременно" diff --cc po/sk.po index dd7cb2636,160da405e..e57f708aa --- a/po/sk.po +++ b/po/sk.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-07-01 09:34+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovaný na %s %s\n" @@@ -288,7 -304,7 +304,7 @@@ msgstr " " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovaÅ¥" @@@ -614,79 -630,79 +630,79 @@@ msgstr "Problém s odlinkovaním %s msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ale nainÅ¡talovaný je %s" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ale inÅ¡talovaÅ¥ sa bude %s" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ale sa nedá nainÅ¡talovaÅ¥" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ale nie je nainÅ¡talovaný" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ale sa nebude inÅ¡talovaÅ¥" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " alebo" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné NOVÉ balíky:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -695,122 -711,144 +711,144 @@@ msgstr " "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových inÅ¡talovaných, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinÅ¡talovaných, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainÅ¡talovaných alebo odstránených.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " zlyhalo." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviÅ¥" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Sada pre aktualizáciu sa nedá minimalizovaÅ¥" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Hotovo" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Na opravu môžete spustiÅ¥ `apt-get -f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiÅ¥ -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiÅ¥ vierohodnosÅ¥!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "NainÅ¡talovaÅ¥ tieto nekontrolované balíky [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiÅ¥ vierohodnoÅ¥ niektorých balíkov" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia OdstrániÅ¥ je vypnutá." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Vnútorná chyba pri pridávaní diverzie" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Adresár pre sÅ¥ahovanie sa nedá zamknúť" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nedá sa načítaÅ¥ zoznam zdrojov." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB archívov.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB archívov.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení sa na disku použije ďalších %sB.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Na %s nemáte dostatok voľného miesta" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voľného miesta." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -821,28 -859,28 +859,28 @@@ msgstr " "Pre pokračovanie opíšte frázu '%s'\n" " ?]" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "PreruÅ¡ené." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovaÅ¥ [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuÅ¥" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "SÅ¥ahovanie ukončené v režime \"iba stiahnuÅ¥\"" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -850,47 -888,47 +888,47 @@@ msgstr " "Niektoré archívy sa nedajú stiahnuÅ¥. Skúste spustiÅ¥ apt-get update alebo --" "fix-missing" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výmena média nie sú momentálne podporované" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviÅ¥." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "InÅ¡talácia sa preruÅ¡uje." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Poznámka: %s sa vyberá namiesto %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskakuje sa %s, pretože je už nainÅ¡talovaný.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s nie je nainÅ¡talovaný, nedá sa teda odstrániÅ¥\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuálny balík poskytovaný:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "[InÅ¡talovaný]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Mali by ste explicitne vybraÅ¥ jeden na inÅ¡taláciu." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -900,49 -938,49 +938,49 @@@ msgstr " "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n" "že balík chýba, bol zruÅ¡ený, alebo je dostupný iba z iného zdroja\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "AvÅ¡ak nahrádzajú ho nasledovné balíky:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta na inÅ¡taláciu" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nie je možná reinÅ¡talácia %s, pretože sa nedá stiahnuÅ¥.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je už najnovÅ¡ej verzie.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie '%s' pre '%s'" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia '%s' pre '%s'" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Zvolená verzia %s (%s) pre %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -950,25 -988,25 +988,44 @@@ msgstr " "Niektoré indexové súbory sa nepodarilo stiahnuÅ¥, boli ignorované, alebo sa " "použili starÅ¡ie verzie." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Nasledovné informácie vám možno pomôžu vyrieÅ¡iÅ¥ túto situáciu:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Vnútorná chyba, AllUpgrade pokazil veci" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsÅ¥" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Na opravu nasledovných môžete spustiÅ¥ `apt-get -f install':" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -976,7 -1014,7 +1033,7 @@@ msgstr " "Nesplnené závislosti. Skúste spustiÅ¥ 'apt-get -f install' bez balíkov (alebo " "navrhnite rieÅ¡enie)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -988,7 -1026,7 +1045,7 @@@ msgstr " "požadované balíky eÅ¡te neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -998,114 -1036,124 +1055,120 @@@ msgstr " "balík nie je inÅ¡talovateľný a mali by ste zaslaÅ¥ hlásenie o chybe\n" "(bug report) pre daný balík." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Nasledovné informácie vám možno pomôžu vyrieÅ¡iÅ¥ túto situáciu:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "PoÅ¡kodené balíky" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné extra balíky:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Navrhované balíky:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Odporúčané balíky:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Chyba" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Hotovo" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Vnútorná chyba, AllUpgrade pokazil veci" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadaÅ¥ aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsÅ¥ zdrojový balík pre %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB zdrojových archívov.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB zdrojových archívov.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "StiahnuÅ¥ zdroj %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Proces potomka zlyhal" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadaÅ¥ aspoň jeden balík, pre ktorý sa budú overovaÅ¥ závislosti na " "zostavenie" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získaÅ¥ závislosti pre zostavenie %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosÅ¥ pre %s sa nemôže splniÅ¥, pretože sa nedá nájsÅ¥ balík %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1114,31 -1162,31 +1177,31 @@@ msgstr " "%s závislosÅ¥ pre %s sa nedá splniÅ¥, protože sa nedá nájsÅ¥ verzia balíku %s, " "ktorá zodpovedá požiadavke na verziu" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: InÅ¡talovaný balík %s je príliÅ¡ nový" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniÅ¥." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Podporované moduly:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1443,8 -1491,8 +1506,9 @@@ msgstr "PrepísaÅ¥ zodpovedajúci balí msgid "File %s/%s overwrites the one in the package %s" msgstr "Súbor %s/%s prepisuje ten z balíka %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s sa nedá čítaÅ¥" @@@ -1474,9 -1522,9 +1538,9 @@@ msgid "The info and temp directories ne msgstr "Adresáre info a temp musia byÅ¥ na tom istom súborovom systéme" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Načítavajú sa zoznamy balíkov" @@@ -2189,18 -2277,18 +2293,28 @@@ msgstr "voliteľný msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Vytvára sa strom závislostí" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidátske verzie" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generovanie závislostí" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Zlučujú sa dostupné informácie" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Zápis do súboru %s zlyhal" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2211,52 -2299,52 +2325,52 @@@ msgstr "Súbor %s sa nedá spracovaÅ¥ ( msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovaÅ¥ (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (Absolútny dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliÅ¡ dlhý." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)" @@@ -2277,13 -2365,13 +2391,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexový typ súboru '%s' nie je podporovaný" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinÅ¡talovaÅ¥ balík %s, ale nemôžem pre neho nájsÅ¥ archív." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2291,7 -2379,7 +2405,7 @@@ msgstr " "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviÅ¥, niektoré balíky držíte v naruÅ¡enom stave." @@@ -2315,12 -2408,20 +2434,20 @@@ msgstr "Nedá sa nájsÅ¥ ovládač spô msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Výmena média: Vložte disk nazvaný\n" + " '%s'\n" + "do mechaniky '%s' a stlačte Enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' nie je podporovaný" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiÅ¥ vhodný typ balíčkovacieho systému" @@@ -2354,84 -2455,84 +2481,84 @@@ msgstr "Nezrozumiteľné pripevnenie ty msgid "No priority (or zero) specified for pin" msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Chyba pri spracovaní %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Chyba pri spracovaní %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Chyba pri spracovaní %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Chyba pri spracovaní %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Chyba pri spracovaní %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Chyba pri spracovaní %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Chyba pri spracovaní %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovaÅ¥." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovaÅ¥." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovaÅ¥." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovaní %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Chyba pri spracovaní %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiÅ¥ zoznam zdrojových balíkov %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" @@@ -2440,7 -2541,7 +2567,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" @@@ -2453,7 -2554,7 +2580,7 @@@ msgstr " "Nedá sa nájsÅ¥ súbor s balíkom %s. To by mohlo znamenaÅ¥, že tento balík je " "potrebné opraviÅ¥ manuálne (kvôli chýbajúcej architektúre)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2462,13 -2563,13 +2589,13 @@@ msgstr " "Nedá sa nájsÅ¥ súbor s balíkom %s. Asi budete musieÅ¥ opraviÅ¥ tento balík " "manuálne." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú naruÅ¡ené. Chýba pole Filename: pre balík %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@@ -2572,5 -2673,59 +2699,59 @@@ msgstr "Zapísaných %i záznamov s %i msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Otvára sa %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Otvára sa %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Otvára sa konfiguračný súbor %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Pripája sa k %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " NainÅ¡talovaná verzia: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Otvára sa %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Odporúča" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Spojenie bolo predčasne ukončené" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Neznáme ID výrobcu '%s' na riadku %u v zdrojovom zozname %s" diff --cc po/sl.po index ad8aea470,6e6a46613..c7f512189 --- a/po/sl.po +++ b/po/sl.po @@@ -4,7 -4,7 +4,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Èuhalev \n" "Language-Team: Slovenian \n" @@@ -144,8 -144,8 +144,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@@ -285,7 -301,7 +301,7 @@@ msgstr " " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno mo¾nost, npr. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoèe pisati na %s" @@@ -612,79 -628,79 +628,79 @@@ msgstr "Napaka pri odvezovanju %s msgid "Failed to rename %s to %s" msgstr "Ni mogoèe preimenovati %s v %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nere¹ene odvisnosti:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s name¹èen" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s name¹èen" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "vendar ni name¹èen" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "vendar ne bo name¹èen" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ali" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo name¹èeni:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadr¾ani:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Naslednji zadr¾ani paketi bodo spremenjeni:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -693,122 -709,144 +709,144 @@@ msgstr " "OPOZORILO: Naslednji kljuèni paketi bodo odstranjeni.\n" "To NI priporoèljivo, razen èe natanèno veste, kaj poènete." --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo name¹èenih, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma name¹èenih ali odstranjenih.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " spodletelo." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Ni mogoèe popraviti odvisnosti" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoèe pomanj¹ati zbirke za nadgradnjo" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Opravljeno" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Èe ¾elite popraviti napake, poskusite pognati 'apt-get -f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nere¹ene odvisnosti. Poskusite uporabiti -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZORO: Naslednjih paketov ni bilo mogoèe avtenticirati!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Namestim te pakete brez prevejanje [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Nisem uspel avtenticirati nekaterih paketkov" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Pri¹lo je do te¾av in -y je bil uporabljen brez --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoèeno." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Notranja napaka pri dodajanju odklona" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Ni mogoèe zakleniti imenika za prenose" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoèe brati." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Nimate dovolj prostora na %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s je premalo prostora." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Izbrana je mo¾nost Samo preprosto, a to opravilo ni preprosto." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -819,28 -857,28 +857,28 @@@ msgstr " "Za nadaljevanje vnesite frazo '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Prekini." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Ali ¾elite nadaljevati [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoèe dobiti %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Prenos dokonèan in uporabljen naèin samo prenos" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -848,47 -886,47 +886,47 @@@ msgstr " "Nekaterih arhivov ni mogoèe dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Ni mogoèe popraviti manjkajoèih paketov." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Prekinjanje namestitve." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Opomba: izbran %s namesto %s \n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ni name¹èen, zato ni odstranjen\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Name¹èeno]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga ¾elite namestiti." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -899,49 -937,49 +937,49 @@@ msgstr " "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s nima kandidata za namestitev" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni mo¾na, ker ni mo¾en prenos.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnovej¹a razlièica %s je ¾e name¹èena.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoèe najti" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razlièice '%s' za '%s' ni mogoèe najti" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razlièica %s (%s) za %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoèe zakleniti" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -949,25 -987,25 +987,44 @@@ msgstr " "Nekaterih kazal ni mogoèe prenesti, zato so preklicana, ali pa so " "uporabljena starej¹a." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Notranja napaka zaradi AllUpgrade." ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoèe najti paketa %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -975,7 -1013,7 +1032,7 @@@ msgstr " "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte re¹itev)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -986,7 -1024,7 +1043,7 @@@ msgstr " "nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -996,115 -1034,125 +1053,121 @@@ msgstr " "preprosto ne da namestiti in je potrebno vlo¾iti poroèilo o hro¹èu\n" "o tem paketu." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pokvarjeni paketi" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo name¹èeni:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Predlagani paketi:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Priporoèeni paketi:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Preraèunavanje nadgradnje ... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Spodletelo" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Opravljeno" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Notranja napaka zaradi AllUpgrade." + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoèe najti" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoèe dobiti." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Otro¹ki proces ni uspel" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega ¾elite preveriti odvisnosti " "za gradnjo" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1113,31 -1161,31 +1176,31 @@@ msgstr " "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne " "more zadostiti zahtevi po razlièici" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Podprti moduli:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1444,8 -1492,8 +1507,9 @@@ msgstr "Prepi¹i zadetek paketa brez vno msgid "File %s/%s overwrites the one in the package %s" msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ni mogoèe brati %s" @@@ -1475,9 -1523,9 +1539,9 @@@ msgid "The info and temp directories ne msgstr "Podatki in zaèasni imeniki morajo biti v istem datoteènem sistemu" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Branje seznama paketov" @@@ -2188,18 -2276,18 +2292,28 @@@ msgstr "izbirno msgid "extra" msgstr "dodatno" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Gradnja drevesa odvisnosti" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Razlièice kandidatov" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Spajanje informacij na voljo" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Napaka pri pisanju datoteke %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2210,52 -2298,52 +2324,52 @@@ msgstr "Ni mogoèe razèleniti paketne da msgid "Unable to parse package file %s (2)" msgstr "Ni mogoèe razèleniti paketne datoteke %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Napaèna vrstica %lu v seznamu virov %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Napaèna vrstica %lu v seznamu virov %s (distribucija)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Napaèna vrstica %lu v seznamu virov %s (absolutna distribucija)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev distribucije)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Odpiram %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Napaèna vrstica %u v seznamu virov %s (vrsta)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napaèna vrstica %u v seznamu virov %s (ID ponudnika)" @@@ -2276,14 -2364,14 +2390,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Vrsta datoteke s kazalom '%s' ni podprta" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Paket %s mora biti ponovno name¹èen, vendar ne morem najti arhiva zanj." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2291,7 -2379,7 +2405,7 @@@ msgstr " "Napaka. pkgProblemResolver::Napake pri razre¹itvi, ki so jih morda " "povzroèili zadr¾ani paketi." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoèe popraviti te¾av. Imate zadr¾ane pakete." @@@ -2315,12 -2408,20 +2434,20 @@@ msgstr "Ni mogoèe najti gonilnika meto msgid "Method %s did not start correctly" msgstr "Metoda %s se ni zaèela pravilno" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Sprememba medija: vstavite disk z oznako\n" + " '%s'\n" + "v enoto '%s' in pritisnite enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema" @@@ -2354,82 -2455,82 +2481,82 @@@ msgstr "Ni mogoèe razumeti vrste zaponk msgid "No priority (or zero) specified for pin" msgstr "Prioriteta zaponke ni doloèena ali pa je niè." --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Predpomnilnik ima neustrezen sistem razlièic" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nov paket)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, presegli ste ¹tevilo imen paketov, ki jih zmore APT." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Uau, presegli ste ¹tevilo odvisnosti, ki jih zmore APT." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Pri¹lo je do napake pri obdelavi %s (Najdi paket)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Pri¹lo je do napake pri obdelavi %s (Zberi dobavitelje datotek)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoèe najti med obdelavo odvisnosti" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoèe doloèiti seznama izvornih paketov %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" @@@ -2438,7 -2539,7 +2565,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" @@@ -2451,7 -2552,7 +2578,7 @@@ msgstr " "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket (zaradi manjkajoèega arhiva)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2460,7 -2561,7 +2587,7 @@@ msgstr " "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2468,7 -2569,7 +2595,7 @@@ msgstr " "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@@ -2573,5 -2674,59 +2700,59 @@@ msgstr " "Zapisal %i zapisov z %i manjkajoèimi datotekami in %i neujemajoèimi " "datotekami.\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Odpiram %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Odpiram %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Odpiranje nastavitvene datoteke %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Povezujem se z %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Name¹èen: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Odpiram %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Priporoèa" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Povezava se je prezgodaj zaprla" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Neznan ID ponudnika '%s' v vrstici %u v seznamu virov %s" diff --cc po/sv.po index 367f6680e,b93c051fe..db12e7d44 --- a/po/sv.po +++ b/po/sv.po @@@ -1,16 -1,14 +1,16 @@@ -# Advanced Package Tool - APT message translation catalog -# Swedish messages -# Peter Karlsson , 2002-2005. -# +# Advanced Package Tool - APT message translation catalog +# Swedish messages +# Peter Karlsson , 2002-2005. +# Based on Danish messages +# Claus Hindsgaul , 2002. +# msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-02 23:56+0100\n" -"Last-Translator: Daniel Nylander \n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-01-15 15:30+0100\n" +"Last-Translator: Peter Karlsson \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@@ -149,8 -147,8 +149,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s för %s %s kompilerad den %s %s\n" @@@ -229,6 -227,18 +229,22 @@@ msgstr " " -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Ange ett namn för denna skiva, såsom \"Debian 2.1r1 Disk 1\"" ++msgstr "" + + #: cmdline/apt-cdrom.cc:93 ++#, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "Mata in skivan i enheten och tryck Enter" ++msgstr "" ++"Mediabyte: Sätt i disken med etiketten\n" ++" \"%s\"\n" ++"i enhet \"%s\" och tryck Enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Repetera denna process för resten av CD-skivorna i din uppsättning." ++msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Flaggorna gavs inte parvis" @@@ -290,7 -300,7 +306,7 @@@ msgstr " " -c=? Läs denna inställningsfil.\n" " -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@@ -323,8 -333,7 +339,8 @@@ msgstr "Fel vid skrivning av huvud til msgid "Error processing contents %s" msgstr "Fel vid behaldning av innehållet %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -470,8 -479,8 +486,8 @@@ msgstr "F: Felen gäller filen msgid "Failed to resolve %s" msgstr "Misslyckades att slå upp %s" -# ??? +# ??? - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Trävandring misslyckades" @@@ -511,8 -520,8 +527,8 @@@ msgstr " Avlänkningsgräns på %sB nådd.\ msgid "Failed to stat %s" msgstr "Misslyckades att ta status på %s" -# Fält vid namn "Package" +# Fält vid namn "Package" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" @@@ -521,8 -530,8 +537,8 @@@ msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" -# parametrar: paket, ny, gammal +# parametrar: paket, ny, gammal - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för %s är %s ej %s\n" @@@ -624,236 -633,258 +640,258 @@@ msgstr "Problem med att länka ut %s msgid "Failed to rename %s to %s" msgstr "Misslyckades att byta namn på %s till %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljärt uttryck - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "men %s skall installeras" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "men det kan inte installeras" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "men det är inte installerat" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " eller" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Följande hållna paket kommer att ändras:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort\n" -"Detta bör INTE göras såvida du inte vet exakt vad du gör!" +"Detta bör INTE göras såvida du inte vet precis vad du gör!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu uppgraderade, %lu nyinstallerade, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu ominstallerade, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderade, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu ej uppgraderade.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ej helt installerade eller borttagna.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Rättar beroenden...." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " misslyckades." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Kunde inte rätta beroenden" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsättningen" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Färdig" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan möjligen rätta dessa genom att köra \"apt-get -f install\"." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsställda beroenden. Försök med -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Följande paket kunde inte autentiseras!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Authentiseringsvarning överkörd.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installera dessa paket utan verifiering [j/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Internt fel. InstallPackages kallades upp med brutna paket!" ++msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Paket måste tas bort men \"Remove\" är inaktiverat." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Internt fel. Sorteringen färdigställdes inte" ++msgstr "Internt fel när en omdirigering skulle läggas till" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen." - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" -"Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian." -"org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Behöver hämta %sB/%sB arkiv.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Behöver hämta %sB arkiv.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter uppackning kommer %sB ytterligare diskutrymme användas.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigöras på disken.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Kunde inte läsa av ledigt utrymme i %s" ++msgstr "Du har inte tillräckligt ledigt utrymme i %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt ledigt utrymme i %s" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, gör som jag säger!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" "Du är på väg att göra något som kan vara skadligt\n" -"Skriv frasen '%s' för att fortsätta\n" +"Skriv frasen \"%s\" för att fortsätta\n" " ?] " -# Visas då man svarar nej -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +# Visas då man svarar nej - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Avbryter." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades att hämta %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Misslyckades att hämta vissa filer" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -861,48 -892,48 +899,48 @@@ msgstr " "Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med " "--fix-missing." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stöds inte ännu" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Kunde inte rätta saknade paket." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Avbryter installationen." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Observera, väljer %s istället för %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paketet %s är inte installerat, så tas inte bort\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installerat]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Du bör explicit ange ett att installera." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -913,49 -944,49 +951,49 @@@ msgstr " "Detta betyder vanligen att paketet saknas, har blivit föråldrat eller\n" "bara är tillgängligt från andra källor\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Dock kan följande paket ersätta det:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s är redan den senaste versionen.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" för \"%s\" hittades inte" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) för %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -963,25 -994,25 +1001,44 @@@ msgstr " "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " "använts istället." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Följande information kan vara till hjälp för att lösa situationen:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Internt fel, AllUpgrade förstörde något" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för regex \"%s\"\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan möjligen rätta detta genom att köra \"apt-get -f install\":" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -989,7 -1020,7 +1046,7 @@@ msgstr " "Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket " "(eller ange en lösning)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1001,7 -1032,7 +1058,7 @@@ msgstr " "distributionen, att några krävda paket ännu inte har skapats eller\n" "lagts in från \"Incoming\"." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1011,105 -1042,114 +1068,111 @@@ msgstr " "helt enkelt inte kan installeras och att en felrapport om detta bör\n" "skrivas." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Följande information kan vara till hjälp för att lösa situationen:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Trasiga paket" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Föreslagna paket:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Rekommenderade paket:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Misslyckades" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Färdig" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "Internt fel, problemlösaren bröt sönder saker" ++msgstr "Internt fel, AllUpgrade förstörde något" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange åtminstone ett paket att hämta källkod för" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt ledigt utrymme i %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkod %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Misslyckades att hämta vissa arkiv." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad källkod i %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Kontrollera om paketet 'dpkg-dev' är installerat.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Barnprocessen misslyckades" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange åtminstone ett paket att inhämta byggberoenden för" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta byggberoendeinformation för %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1117,7 -1157,7 +1180,7 @@@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1126,32 -1166,32 +1189,32 @@@ msgstr " "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s uppfyller versionskraven" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s " "är för nytt" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades att uppfylla %s-beroendet för %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte uppfyllas." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Moduler som stöds:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1464,8 -1504,8 +1527,9 @@@ msgstr "Skriver över paketträff utan ve msgid "File %s/%s overwrites the one in the package %s" msgstr "Filen %s/%s skriver över den i paketet %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" @@@ -1495,9 -1535,9 +1559,9 @@@ msgid "The info and temp directories ne msgstr "Katalogerna info och temp måste ligga på samma filsystem" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Läser paketlistor" @@@ -1627,7 -1667,11 +1691,12 @@@ msgstr "Fel cd msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Disk ej funnen." ++msgstr "Filen ej funnen" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Filen ej funnen" @@@ -1840,8 -1885,8 +1910,8 @@@ msgstr "Kunde inte slå upp \"%s\" msgid "Temporary failure resolving '%s'" msgstr "Temporärt fel vid uppslagning av \"%s\"" -# Okänd felkod; %i = koden +# Okänd felkod; %i = koden - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Något otäckt hände när \"%s:%s\" slogs upp (%i)" @@@ -1851,6 -1896,45 +1921,44 @@@ msgid "Unable to connect to %s %s:" msgstr "Kunde inte ansluta till %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar." ++msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Åtminstone en giltig signatur träffades på." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Kunde inte exekvera " ++msgstr "Kunde inte erhålla låset %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " för att verifiera signature (är gnupg installerad?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Okänt fel vid exekvering av gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Följande signaturer är ogiltiga:\n" ++msgstr "Följande ytterligare paket kommer att installeras:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Följande signaturer kunde inte verifieras för att den publika nyckeln inte " -"är tillgänglig:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -2069,8 -2149,8 +2173,8 @@@ msgstr "Felaktig operation %s msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status på monteringspunkt %s." -# Felmeddelande för misslyckad chdir +# Felmeddelande för misslyckad chdir - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte gå till %s" @@@ -2218,18 -2298,18 +2322,28 @@@ msgstr "valbart msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Bygger beroendeträd" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandiderande versioner" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Beroendegenerering" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Lägger in tillgänglighetsinformation" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Misslyckades att skriva filen %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2240,52 -2320,52 +2354,52 @@@ msgstr "Kunde inte tolka paketfilen %s msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har fel format (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Öppnar %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u för lång i källistan %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen \"%s\" är okänd på rad %u i källistan %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" @@@ -2307,14 -2387,14 +2421,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexfiler av typ \"%s\" stöds inte" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2322,7 -2402,7 +2436,7 @@@ msgstr " "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " "hållna paket." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållt trasiga paket." @@@ -2336,7 -2416,12 +2450,12 @@@ msgstr "Listkatalogen %spartial saknas. msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial saknas." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Laddar ner fil %li av %li (%s återstår)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Metoddrivrutinen %s kunde inte hittas." @@@ -2346,13 -2431,18 +2465,21 @@@ msgid "Method %s did not start correctly" msgstr "Metoden %s startade inte korrekt" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Mata in disken med etiketten '%s' i enheten '%s' och tryck Enter." ++msgstr "" ++"Mediabyte: Sätt i disken med etiketten\n" ++" \"%s\"\n" ++"i enhet \"%s\" och tryck Enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stöds inte" -# -#: apt-pkg/init.cc:135 +# - #: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte avgöra en lämpligt paketsystemstyp" @@@ -2387,84 -2477,84 +2514,84 @@@ msgstr "Förstod inte nåltypen %s msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) för nål" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cachen har ett inkompatibelt versionssystem" -# NewPackage etc. är funktionsnamn -#: apt-pkg/pkgcachegen.cc:117 +# NewPackage etc. är funktionsnamn - #: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fel uppstod vid hantering av %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fel uppstod vid hantering av %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fel uppstod vid hantering av %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fel uppstod vid hantering av %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fel uppstod vid hantering av %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fel uppstod vid hantering av %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Grattis, du överskred antalet paketnamn denna APT kan hantera." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Grattis, du överskred antalet versioner denna APT kan hantera." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Grattis, du överskred antalet beroenden denna APT kan hantera." -# NewPackage etc. är funktionsnamn -#: apt-pkg/pkgcachegen.cc:241 +# NewPackage etc. är funktionsnamn - #: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte när filberoenden hanterades" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status på källkodspaketlistan %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Samlar filberoenden" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" @@@ -2473,7 -2563,7 +2600,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stämmer inte" @@@ -2486,7 -2576,7 +2613,7 @@@ msgstr " "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2495,13 -2585,13 +2622,13 @@@ msgstr " "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@@ -2604,8 -2694,62 +2731,62 @@@ msgstr "Skrev %i poster med %i filer so msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Förbereder %s" ++msgstr "Öppnar %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Packar upp %s" ++msgstr "Öppnar %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Förbereder konfigurering av %s" ++msgstr "Öppnar konfigurationsfil %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Konfigurerar %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "Installerade %s" ++msgstr " Installerad: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Förbereder för borttagning av %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Tar bort %s" ++msgstr "Öppnar %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "Tog bort %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Förbereder för borttagning med konfiguration %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Borttagen med konfiguration %s" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Förbindelsen stängdes i förtid" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Okänt leverantörs-id \"%s\" pÃ¥ rad %u i källistan %s" +#~ msgstr "Okänt leverantörs-id \"%s\" på rad %u i källistan %s" #~ msgid "" #~ "Some broken packages were found while trying to process build-" diff --cc po/tl.po index 9fc7a93ba,58c30347d..d00ba0fd9 --- a/po/tl.po +++ b/po/tl.po @@@ -10,8 -10,8 +10,8 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-03 03:35+0800\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-02-09 16:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" "MIME-Version: 1.0\n" @@@ -151,8 -151,8 +151,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@@ -234,9 -234,21 +234,25 @@@ msgstr " "Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n" "karagdagang impormasyon\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'" ++msgstr "" + + #: cmdline/apt-cdrom.cc:93 ++#, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter" ++msgstr "" ++"Pagpalit ng Media: Ikasa ang disk na may pangalang\n" ++" '%s'\n" ++"sa drive '%s' at pindutin ang enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set." ++msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Mga argumento ay hindi naka-pares" +msgstr "Mga argumento ay hindi nakapares" #: cmdline/apt-config.cc:76 msgid "" @@@ -289,47 -301,46 +305,47 @@@ msgstr " "Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" "sa pagkaayos at template mula sa mga paketeng debian\n" "\n" -"Mga opsyon:\n" +"Mga option:\n" " -h Itong tulong na ito\n" " -t Itakda ang dir na pansamantala\n" -" -c=? Basahin ang talaksang pagkaayos na ito\n" +" -c=? Basahin ang tipunang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Hindi makasulat sa %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" +msgstr "Hindi makuha ang bersyon ng debconf. Naka-instol ba ang debconf?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" +msgstr "Mahaba masyado ang talaang extensyon ng mga pakete" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Error sa pagproseso ng directory %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" +msgstr "Mahaba masyado ang talaang extensyon ng pagkukunan (source)" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" +msgstr "Error sa pagsulat ng header sa tipunang nilalaman (contents)" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -407,18 -421,18 +423,18 @@@ msgstr " " -q Tahimik\n" " -d=? Piliin ang optional caching database\n" " --no-delink Enable delinking debug mode\n" -" --contents Pagbuo ng talaksang contents\n" -" -c=? Basahin itong talaksang pagkaayos\n" +" --contents Pagbuo ng tipunang contents\n" +" -c=? Basahin itong tipunang pagkaayos\n" " -o=? Itakda ang isang option na pagkaayos" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" -msgstr "Walang mga pinili na tugma" +msgstr "Walang mga piniling nag-match" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" +msgstr "May mga tipunang kulang sa grupong tipunang pakete `%s'" #: ftparchive/cachedb.cc:45 #, c-format @@@ -466,56 -480,56 +482,56 @@@ msgstr "E: msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " -msgstr "E: Mga error ay tumutukoy sa talaksang " +msgstr "E: Mga error ay tumutukoy sa tipunang " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" -msgstr "Bigo sa pag-resolba ng %s" +msgstr "Sawi sa pag-resolba %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" -msgstr "Bigo ang paglakad sa puno" +msgstr "Sawi ang paglakad sa puno" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" -msgstr "Bigo ang pagbukas ng %s" +msgstr "Sawi ang pagbukas ng %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" -msgstr "Bigo ang pagbasa ng link %s" +msgstr "Sawi ang pagbasa ng link %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" -msgstr "Bigo ang pag-unlink ng %s" +msgstr "Sawi ang pag-unlink ng %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Bigo ang pag-link ng %s sa %s" +msgstr "*** Sawi ang pag-link ng %s sa %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" -msgstr "Bigo ang pag-stat ng %s" +msgstr "Sawi ang pag-stat ng %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" @@@ -622,208 -636,232 +638,230 @@@ msgstr "Problema sa pag-unlink ng %s #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Bigo ang pagpangalan muli ng %s tungong %s" +msgstr "Sawi ang pagpangalan muli ng %s tungong %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "O" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" -msgstr "ngunit ang %s ay nakaluklok" +msgstr "ngunit %s ay naka-instol" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" -msgstr "ngunit ang %s ay iluluklok" +msgstr "ngunit %s ay iinstolahin" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" -msgstr "ngunit hindi ito maaaring iluklok" +msgstr "ngunit hindi ito maaaring instolahin" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" -msgstr "ngunit ito ay hindi nakaluklok" +msgstr "ngunit ito ay hindi naka-instol" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" -msgstr "ngunit ito ay hindi iluluklok" +msgstr "ngunit ito ay hindi iinstolahin" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " o" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" -msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" +msgstr "Ang sumusunod na BAGONG mga pakete ay iinstolahin:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" -msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" +msgstr "Ang susunod na mga pakete ay TATANGGALIN:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" -msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" +msgstr "Ang susunod na mga pakete ay hinayaang maiwanan:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" -msgstr "Ang susunod na mga pakete ay iu-upgrade:" +msgstr "Ang susunod na mga pakete ay ia-apgreyd:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" +"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu nai-upgrade, %lu bagong luklok, " +msgstr "%lu nai-upgrade, %lu bagong instol, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " -msgstr "%lu iniluklok muli, " +msgstr "%lu ininstol muli, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" +msgstr "%lu na tatanggalin at %lu na di inapgreyd.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" +msgstr "%lu na di lubos na na-instol o tinanggal.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." -msgstr " ay bigo." +msgstr " ay sawi." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Tapos" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" -"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " -msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " +msgstr "Instolahin ang mga paketeng ito na walang beripikasyon [o/H]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" -"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" ++msgstr "Internal error sa pagdagdag ng diversion" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" -msgstr "Hindi maaldaba ang directory ng download" +msgstr "Di maaldaba ang directory ng download" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" -"Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." -"org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Matapos magbuklat ay %sB na karagdagang puwang sa disk ay magagamit.\n" +msgstr "Matapos magbuklat ay %sB ng karagdagang lugar sa disk ay magagamit.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Matapos magbuklat %sB na puwang sa disk ay mapapalaya.\n" +msgstr "Matapos magbuklat %sB ng lugar sa disk ay mapapalaya.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Hindi matantsa ang libreng puwang sa %s" ++msgstr "Kulang kayo ng libreng puwang sa %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." -msgstr "Kulang kayo ng libreng puwang sa %s." +msgstr "Kulang kayo ng libreng lugar sa %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -833,28 -871,28 +871,28 @@@ msgstr " "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abort." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Bigo sa pagkuha ng %s %s\n" +msgstr "Sawi sa pagkuha ng %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" -msgstr "May mga talaksang hindi nakuha" +msgstr "May mga tipunang hindi nakuha" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" -msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" +msgstr "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -862,48 -900,48 +900,48 @@@ msgstr " "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Linaktawan ang %s, ito'y naka-instol na at hindi nakatakda ang upgrade.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Hindi naka-instol ang paketeng %s, kaya't hindi ito tinanggal\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Naka-instol]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Dapat ninyong piliin ang isa na instolahin." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -914,76 -952,76 +952,96 @@@ msgstr " "Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ang pag-instol muli ng %s ay hindi maaari, hindi ito makuha.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " +"May mga tipunang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -991,7 -1029,7 +1049,7 @@@ msgstr " "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -1002,7 -1040,7 +1060,7 @@@ msgstr " "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -1012,106 -1050,115 +1070,111 @@@ msgstr " "hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" --"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Sirang mga pakete" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Kinakalkula ang upgrade... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" -msgstr "Bigo" +msgstr "Sawi" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Tapos" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "Error na internal, may nasira ang problem resolver" ++msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." -msgstr "Bigo sa pagkuha ng ilang mga arkibo." +msgstr "Sawi sa pagkuha ng ilang mga arkibo." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Bigo ang utos ng pagbuklat '%s'.\n" +msgstr "Sawi ang utos ng pagbuklat '%s'.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Utos na build '%s' ay bigo.\n" +msgstr "Utos na build '%s' ay sawi.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" -msgstr "Bigo ang prosesong anak" +msgstr "Sawi ang prosesong anak" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1120,7 -1167,7 +1183,7 @@@ msgstr " "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1129,32 -1176,32 +1192,32 @@@ msgstr " "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" +"Sawi sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" +msgstr "Sawi sa pagbuo ng dependensiyang %s para sa %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" -msgstr "Bigo sa pagproseso ng build dependencies" +msgstr "Sawi sa pagproseso ng build dependencies" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Suportadong mga Module:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1460,10 -1507,10 +1523,11 @@@ msgstr "Patungan ng paketeng nag-match #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" +msgstr "Ang tipunang %s/%s ay pumapatong sa isang tipunan sa paketeng %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@@ -1493,9 -1540,9 +1557,9 @@@ msgid "The info and temp directories ne msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" @@@ -1601,9 -1648,9 +1665,9 @@@ msgstr "Sawi sa paghanap ng tanggap na #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "Di maintindihang talaksang control" +msgstr "Di maintindihang tipunang control" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Hindi mabasa ang database ng cdrom %s" @@@ -1625,19 -1672,24 +1689,25 @@@ msgstr "Maling CD msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Hindi nahanap ang Disk." ++msgstr "Hindi Nahanap ang Tipunan" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Hindi Nahanap ang Talaksan" +msgstr "Hindi Nahanap ang Tipunan" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" -msgstr "Bigo ang pag-stat" +msgstr "Sawi ang pag-stat" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Bigo ang pagtakda ng oras ng pagbago" +msgstr "Sawi ang pagtakda ng oras ng pagbago" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //" @@@ -1830,12 -1882,12 +1900,12 @@@ msgstr "Kumokonek sa %s msgid "Could not resolve '%s'" msgstr "Hindi maresolba ang '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'" +msgstr "Pansamantalang kasawian sa pagresolba ng '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" @@@ -1845,6 -1897,48 +1915,44 @@@ msgid "Unable to connect to %s %s:" msgstr "Hindi maka-konek sa %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" -"E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. " -"Lalabas." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " -"fingerprint?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Hindi ma-execute ang " ++msgstr "hindi makuha ang aldaba %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Hindi kilalang error sa pag-execute ng gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Ang sumusunod na mga lagda ay imbalido:\n" ++msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " -"available:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1928,13 -2022,9 +2036,9 @@@ msgstr "Sawi ang koneksyon msgid "Internal error" msgstr "Internal na error" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Nagsara ng maaga ang koneksyon" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" -msgstr "Hindi mai-mmap ang talaksang walang laman" +msgstr "Hindi mai-mmap ang tipunang walang laman" #: apt-pkg/contrib/mmap.cc:87 #, c-format @@@ -1951,12 -2041,12 +2055,12 @@@ msgstr "Piniling %s ay hindi nahanap msgid "Unrecognized type abbreviation: '%c'" msgstr "Hindi kilalang katagang uri: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "Binubuksan ang talaksang pagsasaayos %s" +msgstr "Binubuksan ang tipunang pagsasaayos %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Labis ang haba ng linyang %d (max %d)" @@@ -1997,10 -2087,10 +2101,10 @@@ msgstr "Syntax error %s:%u: Sinama mul msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" +msgstr "Syntax error %s:%u: May basura sa dulo ng tipunan" #: apt-pkg/contrib/progress.cc:154 #, c-format @@@ -2072,26 -2162,27 +2176,26 @@@ msgstr "Di makalipat sa %s #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "Bigo sa pag-stat ng cdrom" +msgstr "Sawi sa pag-stat ng cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" +"Hindi ginagamit ang pagaldaba para sa basa-lamang na tipunang aldaba %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" -msgstr "Hindi mabuksan ang talaksang aldaba %s" +msgstr "Hindi mabuksan ang tipunang aldaba %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " -"nfs" +"Hindi gumagamit ng pag-aldaba para sa tipunang aldaba %s na naka-mount sa nfs" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" @@@ -2116,12 -2207,12 +2220,12 @@@ msgstr "Naghudyat ang sub-process %s n msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" -msgstr "Hindi mabuksan ang talaksang %s" +msgstr "Hindi mabuksan ang tipunang %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" @@@ -2131,17 -2222,17 +2235,17 @@@ msgid "write, still have %lu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "Problema sa pagsara ng talaksan" +msgstr "Problema sa pagsara ng tipunan" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" -msgstr "Problema sa pag-unlink ng talaksan" +msgstr "Problema sa pag-unlink ng tipunan" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "Problema sa pag-sync ng talaksan" +msgstr "Problema sa pag-sync ng tipunan" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" @@@ -2212,18 -2303,18 +2316,28 @@@ msgstr "optional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Ginagawa ang puno ng mga dependensiya" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Bersyong Kandidato" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Pinagsasama ang magagamit na impormasyon" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Sawi sa pagsulat ng tipunang %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2232,57 -2323,57 +2346,57 @@@ msgstr "Hindi ma-parse ang tipunang pak #: apt-pkg/tagfile.cc:160 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Hindi ma-parse ang talaksang pakete %s (2)" +msgstr "Hindi ma-parse ang tipunang pakete %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." -msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." +msgstr "Labis ang haba ng linyang %u sa tipunang pagkukunan %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" +msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (uri)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Di kilalang uri '%s' sa linyang %u sa talaksang pagkukunan %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" +msgstr "Di kilalang uri '%s' sa linyang %u sa tipunang pagkukunan %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" +msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (vendor id)" #: apt-pkg/packagemanager.cc:402 #, c-format @@@ -2299,9 -2390,9 +2413,9 @@@ msgstr " #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Hindi suportado ang uri ng talaksang index na '%s'" +msgstr "Hindi suportado ang uri ng tipunang index na '%s'" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2309,7 -2400,7 +2423,7 @@@ msgstr " "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2317,7 -2408,7 +2431,7 @@@ msgstr " "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." @@@ -2332,7 -2423,12 +2446,12 @@@ msgstr "Nawawala ang directory ng talaa msgid "Archive directory %spartial is missing." msgstr "Nawawala ang directory ng arkibo %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ang driver ng paraang %s ay hindi mahanap." @@@ -2342,12 -2438,18 +2461,20 @@@ msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" -"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." ++"Pagpalit ng Media: Ikasa ang disk na may pangalang\n" ++" '%s'\n" ++"sa drive '%s' at pindutin ang enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " @@@ -2384,93 -2486,93 +2511,93 @@@ msgstr "Hindi naintindihan ang uri ng p msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Hindi akma ang versioning system ng cache" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "May naganap na error habang prinoseso ang %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" -msgstr "Kinukuha ang Talaksang Provides" +msgstr "Kinukuha ang Tipunang Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." +msgstr "pagpalit ng pangalan ay sawi, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" @@@ -2480,27 -2582,27 +2607,27 @@@ msgid " "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " +"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " +"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " +"Sira ang tipunang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Di tugmang laki" @@@ -2545,11 -2647,11 +2672,11 @@@ msgstr "Hinihintay ang disc...\n msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" -msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" +msgstr "Sinisiyasat ang Disc para sa tipunang index...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" @@@ -2604,8 -2706,63 +2731,62 @@@ msgstr "Nagsulat ng %i na record na ma #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " +"Nagsulat ng %i na record na may %i na tipunang kulang at %i na tipunang " "mismatch\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Hinahanda ang %s" ++msgstr "Binubuksan %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Binubuklat ang %s" ++msgstr "Binubuksan %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Hinahanda ang %s upang isaayos" ++msgstr "Binubuksan ang tipunang pagsasaayos %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Isasaayos ang %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "Iniluklok ang %s" ++msgstr " Naka-instol: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Naghahanda para sa pagtanggal ng %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Tinatanggal ang %s" ++msgstr "Binubuksan %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "Tinanggal ang %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Naghahanda upang tanggalin ang %s kasama ang pagkasaayos nito" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Tinanggal ang %s kasama ang pagkasaayos nito" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Nagsara ng maaga ang koneksyon" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "" -#~ "Hindi kilalang vendor ID '%s' sa linya %u ng talaksang pagkukunan %s" +#~ msgstr "Di kilalang vendor ID '%s' sa linya %u ng tipunang pagkukunan %s" diff --cc po/zh_CN.po index f7c0ae1b3,5f2be979d..984285550 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@@ -7,10 -7,10 +7,10 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-10-29 10:08+0800\n" -"Last-Translator: Tchaikov \n" -"Language-Team: Debian Chinese [GB] \n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-02-09 17:34+0800\n" +"Last-Translator: Tchaikov \n" +"Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" @@@ -227,6 -227,19 +227,22 @@@ msgstr " " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" "若要深入了解，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" ++msgstr "" ++"更换介质：请把标有\n" ++"“%s”\n" ++"的碟片插入驱动器“%s”再按回车键\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "参数没有成对" @@@ -288,7 -301,7 +304,7 @@@ msgstr " " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@@ -321,8 -334,7 +337,8 @@@ msgstr "将 header 写到 contents 文ä msgid "Error processing contents %s" msgstr "处理 Contents %s 时出错" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -614,204 -627,224 +630,226 @@@ msgstr "在 unlink %s 时出错 msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "下列的软件包有不能满足的依赖关系：" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装了" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "但却无法安装它" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "但是它只是个虚拟软件包" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "但是它还没有被安装" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " 或" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "下列的软件包的版本将保持不变：" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "下列的软件包将被升级：" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "【警告】：下列的重要软件包将被卸载 \n" -"请勿尝试，除非您确实知道您在做什么！" +"请勿尝试，除非您确实清楚您正在执行的操作！" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "共重新安装了 %lu 个软件包，" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " 失败。" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" -msgstr "无法最小化要升级的软件包集合" +msgstr "无法使升级的软件包集最小化" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " 完成" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。" --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "【警告】：下列的软件包不能通过验证！" +msgstr "【警告】：下列的软件包不能通过认证！" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "忽略了认证警告。\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包么？[y/N] " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" -msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" +msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes。" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" ++msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "内部错误，Ordering 没有完成" ++msgstr "添加 diversion 时出现内部错误" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧" ++msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "无法获知您在 %s 上的空余空间" ++msgstr "您在 %s 上没有足够的空余空间" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 中没有足够的空余空间。" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -821,28 -854,28 +859,28 @@@ msgstr " "若还想继续的话，就输入下面的短句“%s”\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "中止执行。" - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "有一些文件下载失败" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -850,47 -883,47 +888,47 @@@ msgstr " "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "放弃安装。" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意，我选了 %s 而非 %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [已安装]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -901,74 -934,74 +939,93 @@@ msgstr " "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "可是下列的软件包取代了它：" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "软件包 %s 还没有可供安装的候选者" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "下列的信息可能会对问题的解决有所帮助：" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "内部错误，AllUpgrade 造成某些故障" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 造成某些故障" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -976,7 -1009,7 +1033,7 @@@ msgstr " "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -987,7 -1020,7 +1044,7 @@@ msgstr " "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -996,112 -1029,121 +1053,118 @@@ msgstr " "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "下列的信息可能会对问题的解决有所帮助：" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" -msgstr "无法安装的软件包" +msgstr "受损安装包" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "将会安装下列的额外的软件包：" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "建议安装的软件包：" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "推荐安装的软件包：" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "正在筹划升级... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失败" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "完成" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "内部错误，problem resolver 坏事了" ++msgstr "内部错误，AllUpgrade 造成某些故障" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "请检查是否安装了“dpkg-dev”软件包。\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "子进程出错" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1110,30 -1152,30 +1173,30 @@@ msgstr " "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "被支持模块：" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1435,8 -1477,8 +1498,9 @@@ msgstr "用来覆盖的软件包不属ä msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" @@@ -1466,9 -1508,9 +1530,9 @@@ msgid "The info and temp directories ne msgstr "info 和 temp 目录要求处于同一文件系统之下" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "正在读取软件包列表" @@@ -1591,12 -1633,16 +1655,17 @@@ msgstr " msgid "Wrong CD-ROM" msgstr "错误的光盘" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" +msgstr "无法卸载现在挂载于 %s 的 CD-ROM，可能它正在使用中。" - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "找不到光盘。" ++msgstr "无法找到该文件" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "无法找到该文件" @@@ -1815,6 -1862,42 +1885,44 @@@ msgstr "解析“%s:%sâ€æ—¶ï¼Œå‡ºçŽ°äº msgid "Unable to connect to %s %s:" msgstr "不能连接上 %s %s：" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。" ++msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！" ++msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "至少发现一个无效的签名。" ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "未能执行 " ++msgstr "无法获得锁 %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr "用于验证签名(您安装了 gnupg 么？)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "运行 gpgv 时发生未知错误" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "下列签名无效：\n" ++msgstr "将会安装下列的额外的软件包：" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" -msgstr "由于没有公钥，下列签名无法进行验证：\n" ++msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -2177,18 -2256,18 +2281,28 @@@ msgstr "可选 msgid "extra" msgstr "额外" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "候选版本" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "生成依赖关系" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "正在合并现有信息" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "无法写入文件 %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2199,52 -2278,52 +2313,52 @@@ msgstr "无法解析软件包文件 %s msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "正在打开 %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)" @@@ -2265,13 -2344,13 +2379,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "不支持索引文件类型“%s”" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2279,7 -2358,7 +2393,7 @@@ msgstr " "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" @@@ -2295,7 -2374,12 +2409,12 @@@ msgstr "软件包列表的目录 %spart msgid "Archive directory %spartial is missing." msgstr "找不到“%spartial”这个目录。" - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "正在下载第 %li 个文件(共 %li 个，尚需 %s)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" @@@ -2305,12 -2389,17 +2424,20 @@@ msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" ++msgstr "" ++"更换介质：请把标有\n" ++"“%s”\n" ++"的碟片插入驱动器“%s”再按回车键\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@@ -2344,82 -2433,82 +2471,82 @@@ msgstr "无法识别锁定的类型(pi msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "软件包暂存区使用的是不兼容的版本控制系统" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "处理 %s (NewPackage)时出错" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "处理 %s (UsePackage1)时出错" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "处理 %s (UsePackage2)时出错" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "处理 %s (NewFileVer1)时出错" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "处理 %s (NewVersion1)时出错" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "处理 %s (UsePackage3)时出错" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "处理 %s (NewVersion2)时出错" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "糟了，软件包的数量了超出本程序的处理能力。" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "糟了，软件包版本的数量了超出本程序的处理能力。" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "糟了，依赖关系的数量超出了本程序的处理能力。" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "处理 %s (FindPkg)时出错" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "处理 %s (CollectFileProvides)时出错" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "无法写入来源缓存文件" @@@ -2428,7 -2517,7 +2555,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" @@@ -2441,7 -2530,7 +2568,7 @@@ msgstr " "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2449,13 -2538,13 +2576,13 @@@ msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" +msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "大小不符" @@@ -2558,6 -2647,60 +2685,60 @@@ msgstr "已写入 %i æ¡è®°å½•ï¼Œå¹¶æœ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "正在准备 %s" ++msgstr "正在打开 %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "正在解压缩 %s" ++msgstr "正在打开 %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "正在准备配置 %s" ++msgstr "正在打开配置文件 %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "正在配置 %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "已安装 %s" ++msgstr " 已安装：" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "正在准备 %s 的删除操作" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "正在删除 %s" ++msgstr "正在打开 %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "已删除 %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "正在准备连同配置文件的删除 %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "连同配置文件一同删除 %s " ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "连接被永久关闭" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%" diff --cc po/zh_TW.po index f3b425929,53dcde63e..4a6ef2724 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 - #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 - #: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n" @@@ -289,7 -305,7 +305,7 @@@ msgstr " " -c=? 讀取指定的設定檔案\n" " -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "無法寫入『%s』。" @@@ -616,79 -632,79 +632,79 @@@ msgstr "在 unlink %s 時出錯 msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示法出錯 - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有無法滿足的依存關係：" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "但是『%s』卻已經安裝好了。" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "但是『%s』卻將被安裝。" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "但是它卻無法安裝。" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "但是它只是虛擬的套件" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "但是『%s』卻還沒有安裝。" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "但是它卻不會被安裝。" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr "或" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "下列的【新】套件都將被安裝：" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "下列的套件都將被【刪除】：" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "下列的套件都將維持舊版本:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "下列的套件都將更新:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "下列的套件都將被「降級」:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "下列押後的套件都將被更改：" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -697,122 -713,144 +713,144 @@@ msgstr " "警告：下列的重要套件都將被刪除\n" "除非您很清楚在做什麼，請勿輕易嘗試。" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "更新 %lu 個套件，新安裝 %lu 個套件，" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個套件，" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "降 %lu 個套件的版，" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "更正依存關係中..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr "失敗" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "無法更正依存關係。" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "無法最小化升級的套件集合" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " 完成" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "用『apt-get -f install』指令或許能修正這些問題。" --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "無法滿足相依關係。試試看 -f 選項。" --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告：下列的套件驗證失敗！" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "不驗證這些套件就直接安裝？[y/N]" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "部份套件無法驗證" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "內部錯誤：新增轉移(diversion)失敗" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "無法讀取來源單。" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下載 %sB 的檔案。\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解壓縮後將消耗 %sB 的空間。\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "『%s』內沒有足夠的空間。" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "『%s』內沒有足夠的空間。" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -823,28 -861,28 +861,28 @@@ msgstr " "若要繼續的話,就輸入下面的句子“%s”\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "放棄執行。" - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "部份檔案無法下載" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -852,47 -890,47 +890,47 @@@ msgstr " "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n" "選項?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "無法更正遺失的套件。" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "放棄安裝。" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意,選擇了 %s 而非 %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "套件『%s』沒有安裝，所以無法刪除。\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "虛擬套件『%s』的提供者是：\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "【已安裝】" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "請您明確地選擇一個來進行安裝。" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -903,73 -941,73 +941,92 @@@ msgstr " "這可能意味著這個套件已經消失或捨棄,\n" "或者只能在其他原碼中找到\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "但是下列的套件將取代它：" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "套件 %s 還沒有可供安裝的候選版本" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安裝 %s,因為無法下載它。\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "『%s』已經是最新版本了。\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”發布版本" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "選定的版本為 %s (%s) 的 %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "底下的資訊有助於解決現在的情況:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "內部錯誤,AllUpgrade 造成錯誤" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "無法找到 %s 套件。" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "用『apt-get -f install』指令或許能修正這些問題。" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -977,7 -1015,7 +1034,7 @@@ msgstr " "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -988,7 -1026,7 +1045,7 @@@ msgstr " "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 Incoming 目錄移除。" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@@ -998,112 -1036,122 +1055,118 @@@ msgstr " "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "底下的資訊有助於解決現在的情況:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "損毀的套件" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失敗" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "完成" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "內部錯誤,AllUpgrade 造成錯誤" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "子程序失敗" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1112,30 -1160,30 +1175,30 @@@ msgstr " "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "支援模組:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1439,8 -1487,8 +1502,9 @@@ msgstr "複寫套件 %s 無符合版本 msgid "File %s/%s overwrites the one in the package %s" msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "無法讀取『%s』。" @@@ -1470,9 -1518,9 +1534,9 @@@ msgid "The info and temp directories ne msgstr "資料目錄與暫存目錄需在同一檔案系統" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "讀取套件清單中" @@@ -2180,18 -2268,18 +2284,28 @@@ msgstr "次要 msgid "extra" msgstr "添加" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "了解套件依存關係中" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "候選版本" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "產生套件依存關係" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "結合現有資料中" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "寫入檔案 %s 失敗" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2202,52 -2290,52 +2316,52 @@@ msgstr "無法辨識套件『%s』(1)〠msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件『%s』(1)。" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "開啟『%s』中" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "來源檔『%2$s』第 %1$u 行太長。" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。" @@@ -2267,19 -2355,19 +2381,19 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "本軟體不支持『%s』型的索引檔。" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "無法解決依存關係。可能原因是某些套件被押後。" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "無法解決問題，因為某些損毀的套件被押後。" @@@ -2303,12 -2396,20 +2422,20 @@@ msgstr "找不到安裝方式『%sã€çš msgid "Method %s did not start correctly" msgstr "安裝方式『%s』沒有正確啟動。" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "更換媒體:請把名為\n" + " '%s' 的光碟\n" + "插入 '%s' 碟機,然後按 [Enter] 鍵。\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "本軟體不支持『%s』包裝法。" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "無法明白系統類別。" @@@ -2342,82 -2443,82 +2469,82 @@@ msgstr "本軟體不支持『%sã€åž‹çš msgid "No priority (or zero) specified for pin" msgstr "對於釘住的檔案無優先順序" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "套件暫存檔使用的是不相容的版本系統。" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "處理『%s』時發生錯誤 (NewPackage)。" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "處理『%s』時發生錯誤 (UsePackage1)。" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "處理『%s』時發生錯誤 (UsePackage2)。" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "處理『%s』時發生錯誤 (NewVersion1)。" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "處理『%s』時發生錯誤 (UsePackage3)。" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "處理『%s』時發生錯誤 (NewVersion2)。" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "套件數量超過本程式的能力。" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "套件版本數量超過本程式的能力。" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "依存關係數量超過本程式的能力。" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "處理『%s』時發生錯誤 (FindPkg)。" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "當計算相依性時找不到套件 %s %s " --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "無法讀取來源檔『%s』的目錄資料。" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "收集檔案供應" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "無法寫入來源暫存檔。" @@@ -2426,7 -2527,7 +2553,7 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼不符合。" @@@ -2437,20 -2538,20 +2564,20 @@@ msgid " "to manually fix this package. (due to missing arch)" msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "檔案大小不符合。" @@@ -2552,3 -2653,57 +2679,57 @@@ msgstr "寫入 %i 筆 %i å€‹ä¸åŒ¹é…æª #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "開啟『%s』中" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "開啟『%s』中" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "開啟組態檔 %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "聯絡主機『%s』中" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr "已安裝:" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "開啟『%s』中" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "推薦" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "連線不預期的結束"