From: Michael Vogt Date: Thu, 12 Jan 2006 22:44:04 +0000 (+0000) Subject: * merged with apt--debian-sid--0 X-Git-Tag: 0.7.21~284^2~36 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/5c4d7f0764f99ebe6e65933b1bc08671dbab98e9?hp=--cc * merged with apt--debian-sid--0 Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-134 Updated Basque translation * bubulle@debian.org--2005/apt--main--0--patch-135 Completed Basque translation * bubulle@debian.org--2005/apt--main--0--patch-136 French manpage of sources.list updated * bubulle@debian.org--2005/apt--main--0--patch-137 Disable Hebrew translation on trnaslator's request * bubulle@debian.org--2005/apt--main--0--patch-138 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-139 Tagalog translation update * bubulle@debian.org--2005/apt--main--0--patch-140 Fix a translation glitch in German * bubulle@debian.org--2005/apt--main--0--patch-141 Revert the German fix * bubulle@debian.org--2005/apt--main--0--patch-142 Updated Vietnamese translation * bubulle@debian.org--2005/apt--main--0--patch-143 Really add the Vietnamese translation * bubulle@debian.org--2005/apt--main--0--patch-144 Greek translation update * bubulle@debian.org--2005/apt--main--0--patch-145 Simplified Chinese completed * bubulle@debian.org--2005/apt--main--0--patch-146 Czech translation update * bubulle@debian.org--2005/apt--main--0--patch-147 British translation of apt * bubulle@debian.org--2005/apt--main--0--patch-148 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-149 Merge with Michael archive (Debian version) * bubulle@debian.org--2005/apt--main--0--patch-150 Fix typo in apt-get.cc and update PO files * bubulle@debian.org--2005/apt--main--0--patch-151 Update French translation (and document the update-po I ran previously) * bubulle@debian.org--2005/apt--main--0--patch-152 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-153 Close the right bug for Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-154 French manpages translation update * bubulle@debian.org--2005/apt--main--0--patch-155 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-156 Better makefile for more up-to-date PO and POT * bubulle@debian.org--2005/apt--main--0--patch-157 Run make uupdate-po * bubulle@debian.org--2005/apt--main--0--patch-158 Fix spaces errors in some translations * bubulle@debian.org--2005/apt--main--0--patch-159 Patch to allow "make apt-all.pot" work in the baz archive * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-108 * added "gl" to po/LINGUAS * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-109 * add " " in update-po * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-110 * make apt-get source smarter about not downloading the same sources twice * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-111 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-112 * 2006 ftp-archive signing key added * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-113 * be more clever about I-M-S hits for the Release file and gpg-failures with it, requeue it without i-m-s then * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-114 * merged with mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-115 * string fix * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-116 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-117 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-118 * merged from bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-119 * fix http data corruption (#280844) * mvo@debian.org--2005/apt--debian-sid--0--patch-10 * merged with apt--mvo and corrected conflicts in po/ * mvo@debian.org--2005/apt--debian-sid--0--patch-11 * changelog updates * mvo@debian.org--2005/apt--debian-sid--0--patch-12 * apt--mvo merged * mvo@debian.org--2005/apt--debian-sid--0--patch-13 * merged with mvo * mvo@debian.org--2005/apt--debian-sid--0--patch-14 * merged with apt--mvo--0 * mvo@debian.org--2005/apt--debian-sid--0--patch-15 * support multiple signatures * mvo@debian.org--2005/apt--debian-sid--0--patch-16 * merged with main * mvo@debian.org--2005/apt--debian-sid--0--patch-17 * merged with apt--mvo--0 * philippe.batailler@free.fr--2005/apt--main--0--patch-4 Update of sources.list * philippe.batailler@free.fr--2005/apt--main--0--patch-6 Change apt.ent.fr * philippe.batailler@free.fr--2005/apt--main--0--patch-7 Update manpages --- 5c4d7f0764f99ebe6e65933b1bc08671dbab98e9 diff --cc apt-pkg/acquire-item.h index 58c915344,da1bea801..217ddb3ef --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@@ -667,68 -144,19 +667,70 @@@ class pkgAcqMetaSig : public pkgAcquire class pkgAcqMetaIndex : public pkgAcquire::Item { protected: - + /** \brief The fetch command that is currently being processed. */ pkgAcquire::ItemDesc Desc; - string RealURI; // FIXME: is this redundant w/ Desc.URI? + + /** \brief The URI that is actually being downloaded; never + * modified by pkgAcqMetaIndex. + */ + string RealURI; + + /** \brief The file in which the signature for this index was stored. + * + * If empty, the signature and the md5sums of the individual + * indices will not be checked. + */ string SigFile; + + /** \brief The index files to download. */ const vector* IndexTargets; + + /** \brief The parser for the meta-index file. */ indexRecords* MetaIndexParser; + + /** \brief If \b true, the index's signature is currently being verified. + */ bool AuthPass; + // required to deal gracefully with problems caused by incorrect ims hits + bool IMSHit; + /** \brief Check that the release file is a release file for the + * correct distribution. + * + * \return \b true if no fatal errors were encountered. + */ - bool VerifyVendor(); + bool VerifyVendor(string Message); + + /** \brief Called when a file is finished being retrieved. + * + * If the file was not downloaded to DestFile, a copy process is + * set up to copy it to DestFile; otherwise, Complete is set to \b + * true and the file is moved to its final location. + * + * \param Message The message block received from the fetch + * subprocess. + */ void RetrievalDone(string Message); + + /** \brief Called when authentication succeeded. + * + * Sanity-checks the authenticated file, queues up the individual + * index files for download, and saves the signature in the lists + * directory next to the authenticated list file. + * + * \param Message The message block received from the fetch + * subprocess. + */ void AuthDone(string Message); + + /** \brief Starts downloading the individual index files. + * + * \param verify If \b true, only indices whose expected md5sum + * can be determined from the meta-index will be downloaded, and + * the md5sums of indices will be checked (reporting + * #StatAuthError if there is a mismatch). If verify is \b false, + * no md5sum checking will be performed. + */ void QueueIndexes(bool verify); public: diff --cc apt-pkg/init.h index 8255b406a,8255b406a..63547619f --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@@ -17,8 -17,8 +17,8 @@@ #include // See the makefile --#define APT_PKG_MAJOR 3 --#define APT_PKG_MINOR 11 ++#define APT_PKG_MAJOR 4 ++#define APT_PKG_MINOR 0 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --cc apt-pkg/makefile index 0e6aecc65,0e6aecc65..fa0efe5b2 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@@ -13,7 -13,7 +13,7 @@@ include ../buildlib/defaults.ma # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) --MAJOR=3.11 ++MAJOR=4.0 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --cc debian/changelog index a065fd00e,020fe9813..b54cb635f --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,41 +1,51 @@@ - apt (0.6.43exp1) experimental; urgency=low ++apt (0.6.43.2exp1) experimental; urgency=low + - * added support for package index diffs ++ * added support for package index diffs + * added support for i18n of the package descriptions + * synced with the apt--debian-sid--0 branch + * build from mvo@debian.org--2005/apt--debian-experimental--0 + (from http://people.debian.org/~mvo/arch) - * fix bug in apt-cache when displaying the record (closes: #334887) ++ ++ -- Michael Vogt Thu, 12 Jan 2006 23:40:32 +0100 ++ + apt (0.6.43.2) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: + - en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) * add patch to fix http download corruption problem (thanks to Petr Vandrovec, closes: #280844, #290694) - * changed abi version to 3.12 - - -- Michael Vogt Sun, 13 Nov 2005 13:33:57 +0100 + + -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 + + apt (0.6.43.1) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: + * fr.po: Completed to 510 strings + * it.po: Completed to 510t + * en_GB.po: Completed to 510t + * cs.po: Completed to 510t + * zh_CN.po: Completed to 510t + * el.po: Updated to 510t + * vi.po: Updated to 383t93f34u + * tl.po: Completed to 510 strings (Closes: #344306) + * sv.po: Completed to 510 strings (Closes: #344056) + * LINGUAS: disabled Hebrew translation. (Closes: #313283) + * eu.po: Completed to 510 strings (Closes: #342091) + * apt-get source won't download already downloaded files again + (closes: #79277) + * share/debian-archive.gpg: new 2006 ftp-archive signing key added + (#345891) + * redownload the Release file if IMS-Hit and gpg failure + * deal with multiple signatures on a Release file + + -- Michael Vogt Fri, 6 Jan 2006 01:17:08 +0100 apt (0.6.43) unstable; urgency=medium diff --cc methods/makefile index d0b5a28c0,1e3b1ef85..03146d1bc --- a/methods/makefile +++ b/methods/makefile @@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma BIN := $(BIN)/methods # FIXME.. --LIB_APT_PKG_MAJOR = 3.11 ++LIB_APT_PKG_MAJOR = 4.0 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method diff --cc po/apt-all.pot index 1057afa5e,0293026c4..541a90df4 --- 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-30 11:23+0100\n" -"POT-Creation-Date: 2006-01-04 18:51+0100\n" ++"POT-Creation-Date: 2005-10-17 19:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -20,9 -20,9 +20,9 @@@ msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 - #: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 ++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "" @@@ -96,72 -88,72 +96,72 @@@ msgstr " msgid "Package file %s is out of sync." msgstr "" - #: cmdline/apt-cache.cc:1287 -#: cmdline/apt-cache.cc:1231 ++#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" - #: cmdline/apt-cache.cc:1441 -#: cmdline/apt-cache.cc:1385 ++#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "" - #: cmdline/apt-cache.cc:1518 -#: cmdline/apt-cache.cc:1462 ++#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "" - #: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 ++#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" - #: cmdline/apt-cache.cc:1526 -#: cmdline/apt-cache.cc:1470 ++#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins - #: cmdline/apt-cache.cc:1538 -#: cmdline/apt-cache.cc:1482 ++#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" - #: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 ++#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "" #. Installed version - #: cmdline/apt-cache.cc:1571 -#: cmdline/apt-cache.cc:1515 ++#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "" - #: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 ++#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version - #: cmdline/apt-cache.cc:1578 -#: cmdline/apt-cache.cc:1522 ++#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" - #: cmdline/apt-cache.cc:1588 -#: cmdline/apt-cache.cc:1532 ++#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables - #: cmdline/apt-cache.cc:1597 -#: cmdline/apt-cache.cc:1541 ++#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" - #: cmdline/apt-cache.cc:1612 -#: cmdline/apt-cache.cc:1556 ++#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" - #: cmdline/apt-cache.cc:1707 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 ++#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" - #: cmdline/apt-cache.cc:1714 -#: cmdline/apt-cache.cc:1658 ++#: cmdline/apt-cache.cc:1720 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -200,18 -192,18 +200,6 @@@ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" --#: cmdline/apt-cdrom.cc:78 --msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" --msgstr "" -- --#: cmdline/apt-cdrom.cc:93 --msgid "Please insert a Disc in the drive and press enter" --msgstr "" -- --#: cmdline/apt-cdrom.cc:117 --msgid "Repeat this process for the rest of the CDs in your set." --msgstr "" -- #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "" @@@ -434,12 -426,12 +422,12 @@@ msgstr " msgid "Archive had no package field" msgstr "" --#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 ++#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 #, c-format msgid " %s has no override entry\n" msgstr "" --#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 ++#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" @@@ -543,7 -535,7 +531,7 @@@ msgstr " msgid "Y" msgstr "" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 ++#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -702,11 -694,11 +690,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" - #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 ++#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 ++#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@@ -735,7 -727,7 +723,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 ++#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -769,7 -761,7 +757,7 @@@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 ++#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -778,7 -770,7 +766,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 ++#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 msgid "Download complete and in download only mode" msgstr "" @@@ -870,45 -862,45 +858,45 @@@ msgstr " msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1311 -#: cmdline/apt-get.cc:1313 ++#: cmdline/apt-get.cc:1284 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 ++#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1382 -#: cmdline/apt-get.cc:1384 ++#: cmdline/apt-get.cc:1355 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1401 -#: cmdline/apt-get.cc:1403 ++#: cmdline/apt-get.cc:1374 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 ++#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1523 -#: cmdline/apt-get.cc:1525 ++#: cmdline/apt-get.cc:1496 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1553 -#: cmdline/apt-get.cc:1555 ++#: cmdline/apt-get.cc:1526 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1556 -#: cmdline/apt-get.cc:1558 ++#: cmdline/apt-get.cc:1529 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1568 -#: cmdline/apt-get.cc:1570 ++#: cmdline/apt-get.cc:1541 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" @@@ -916,158 -908,163 +904,158 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1576 -#: cmdline/apt-get.cc:1578 ++#: cmdline/apt-get.cc:1549 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:1581 -#: cmdline/apt-get.cc:1583 ++#: cmdline/apt-get.cc:1554 msgid "The following information may help to resolve the situation:" msgstr "" - #: cmdline/apt-get.cc:1584 -#: cmdline/apt-get.cc:1586 ++#: cmdline/apt-get.cc:1557 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1610 -#: cmdline/apt-get.cc:1612 ++#: cmdline/apt-get.cc:1583 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1683 ++#: cmdline/apt-get.cc:1654 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1682 -#: cmdline/apt-get.cc:1684 ++#: cmdline/apt-get.cc:1655 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1702 -#: cmdline/apt-get.cc:1704 ++#: cmdline/apt-get.cc:1675 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1710 -#: cmdline/apt-get.cc:1712 ++#: cmdline/apt-get.cc:1683 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 ++#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:1883 -#: cmdline/apt-get.cc:1885 ++#: cmdline/apt-get.cc:1856 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 ++#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1957 -#: cmdline/apt-get.cc:1959 -#, c-format -msgid "Skiping already downloaded file '%s'\n" -msgstr "" - -#: cmdline/apt-get.cc:1983 ++#: cmdline/apt-get.cc:1930 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1962 -#: cmdline/apt-get.cc:1988 ++#: cmdline/apt-get.cc:1935 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1965 -#: cmdline/apt-get.cc:1991 ++#: cmdline/apt-get.cc:1938 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1971 -#: cmdline/apt-get.cc:1997 ++#: cmdline/apt-get.cc:1944 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2002 -#: cmdline/apt-get.cc:2028 ++#: cmdline/apt-get.cc:1975 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2056 ++#: cmdline/apt-get.cc:2003 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2042 -#: cmdline/apt-get.cc:2068 ++#: cmdline/apt-get.cc:2015 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2043 -#: cmdline/apt-get.cc:2069 ++#: cmdline/apt-get.cc:2016 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2060 -#: cmdline/apt-get.cc:2086 ++#: cmdline/apt-get.cc:2033 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2079 -#: cmdline/apt-get.cc:2105 ++#: cmdline/apt-get.cc:2052 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2095 -#: cmdline/apt-get.cc:2121 ++#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2123 -#: cmdline/apt-get.cc:2149 ++#: cmdline/apt-get.cc:2096 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2143 -#: cmdline/apt-get.cc:2169 ++#: cmdline/apt-get.cc:2116 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2195 -#: cmdline/apt-get.cc:2221 ++#: cmdline/apt-get.cc:2168 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2247 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2220 #, 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:2282 -#: cmdline/apt-get.cc:2308 ++#: cmdline/apt-get.cc:2255 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2307 -#: cmdline/apt-get.cc:2333 ++#: cmdline/apt-get.cc:2280 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2347 ++#: cmdline/apt-get.cc:2294 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2325 -#: cmdline/apt-get.cc:2351 ++#: cmdline/apt-get.cc:2298 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2357 -#: cmdline/apt-get.cc:2383 ++#: cmdline/apt-get.cc:2330 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2398 -#: cmdline/apt-get.cc:2424 ++#: cmdline/apt-get.cc:2371 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1268,7 -1265,7 +1256,7 @@@ msgstr " msgid "Failed to write file %s" msgstr "" --#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 ++#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" msgstr "" @@@ -1321,8 -1318,8 +1309,7 @@@ 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/sourcelist.cc:324 --#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@@ -1618,7 -1614,7 +1605,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" - #: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 -#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 ++#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1748,76 -1744,76 +1735,76 @@@ msgstr " msgid "Read error from %s process" msgstr "" - #: methods/http.cc:375 -#: methods/http.cc:381 ++#: methods/http.cc:345 msgid "Waiting for headers" msgstr "" - #: methods/http.cc:521 -#: methods/http.cc:527 ++#: methods/http.cc:491 #, c-format msgid "Got a single header line over %u chars" msgstr "" - #: methods/http.cc:529 -#: methods/http.cc:535 ++#: methods/http.cc:499 msgid "Bad header line" msgstr "" - #: methods/http.cc:548 methods/http.cc:555 -#: methods/http.cc:554 methods/http.cc:561 ++#: methods/http.cc:518 methods/http.cc:525 msgid "The HTTP server sent an invalid reply header" msgstr "" - #: methods/http.cc:584 -#: methods/http.cc:590 ++#: methods/http.cc:554 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" - #: methods/http.cc:599 -#: methods/http.cc:605 ++#: methods/http.cc:569 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" - #: methods/http.cc:601 -#: methods/http.cc:607 ++#: methods/http.cc:571 msgid "This HTTP server has broken range support" msgstr "" - #: methods/http.cc:625 -#: methods/http.cc:631 ++#: methods/http.cc:595 msgid "Unknown date format" msgstr "" - #: methods/http.cc:772 -#: methods/http.cc:778 ++#: methods/http.cc:742 msgid "Select failed" msgstr "" - #: methods/http.cc:777 -#: methods/http.cc:783 ++#: methods/http.cc:747 msgid "Connection timed out" msgstr "" - #: methods/http.cc:800 -#: methods/http.cc:806 ++#: methods/http.cc:770 msgid "Error writing to output file" msgstr "" - #: methods/http.cc:831 -#: methods/http.cc:837 ++#: methods/http.cc:798 msgid "Error writing to file" msgstr "" - #: methods/http.cc:859 -#: methods/http.cc:865 ++#: methods/http.cc:823 msgid "Error writing to the file" msgstr "" - #: methods/http.cc:873 -#: methods/http.cc:879 ++#: methods/http.cc:837 msgid "Error reading from server. Remote end closed connection" msgstr "" - #: methods/http.cc:875 -#: methods/http.cc:881 ++#: methods/http.cc:839 msgid "Error reading from server" msgstr "" - #: methods/http.cc:1106 -#: methods/http.cc:1112 ++#: methods/http.cc:1070 msgid "Bad header data" msgstr "" - #: methods/http.cc:1123 -#: methods/http.cc:1129 ++#: methods/http.cc:1087 msgid "Connection failed" msgstr "" - #: methods/http.cc:1214 -#: methods/http.cc:1220 ++#: methods/http.cc:1178 msgid "Internal error" msgstr "" @@@ -1838,7 -1826,7 +1817,7 @@@ msgstr " msgid "Couldn't make mmap of %lu bytes" msgstr "" - #: apt-pkg/contrib/strutl.cc:981 -#: apt-pkg/contrib/strutl.cc:938 ++#: apt-pkg/contrib/strutl.cc:984 #, c-format msgid "Selection %s not found" msgstr "" @@@ -1959,7 -1947,7 +1938,7 @@@ msgstr " msgid "Unable to stat the mount point %s" msgstr "" --#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 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 "" @@@ -2035,72 -2023,72 +2014,72 @@@ msgstr " msgid "Problem syncing the file" msgstr "" - #: apt-pkg/pkgcache.cc:137 -#: apt-pkg/pkgcache.cc:126 ++#: apt-pkg/pkgcache.cc:135 msgid "Empty package cache" msgstr "" - #: apt-pkg/pkgcache.cc:143 -#: apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:141 msgid "The package cache file is corrupted" msgstr "" - #: apt-pkg/pkgcache.cc:148 -#: apt-pkg/pkgcache.cc:137 ++#: apt-pkg/pkgcache.cc:146 msgid "The package cache file is an incompatible version" msgstr "" - #: apt-pkg/pkgcache.cc:153 -#: apt-pkg/pkgcache.cc:142 ++#: apt-pkg/pkgcache.cc:151 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" - #: apt-pkg/pkgcache.cc:158 -#: apt-pkg/pkgcache.cc:147 ++#: apt-pkg/pkgcache.cc:156 msgid "The package cache was built for a different architecture" msgstr "" - #: apt-pkg/pkgcache.cc:229 -#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Depends" msgstr "" - #: apt-pkg/pkgcache.cc:229 -#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "PreDepends" msgstr "" - #: apt-pkg/pkgcache.cc:229 -#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Suggests" msgstr "" - #: apt-pkg/pkgcache.cc:230 -#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Recommends" msgstr "" - #: apt-pkg/pkgcache.cc:230 -#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Conflicts" msgstr "" - #: apt-pkg/pkgcache.cc:230 -#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Replaces" msgstr "" - #: apt-pkg/pkgcache.cc:231 -#: apt-pkg/pkgcache.cc:220 ++#: apt-pkg/pkgcache.cc:229 msgid "Obsoletes" msgstr "" - #: apt-pkg/pkgcache.cc:242 -#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "important" msgstr "" - #: apt-pkg/pkgcache.cc:242 -#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "required" msgstr "" - #: apt-pkg/pkgcache.cc:242 -#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "standard" msgstr "" - #: apt-pkg/pkgcache.cc:243 -#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "optional" msgstr "" - #: apt-pkg/pkgcache.cc:243 -#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "extra" msgstr "" @@@ -2126,52 -2114,52 +2105,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:94 ++#: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:96 ++#: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:99 ++#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:112 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:203 ++#: apt-pkg/sourcelist.cc:156 #, c-format msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:240 ++#: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:244 ++#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" --#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 ++#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2215,7 -2203,7 +2194,7 @@@ msgstr " msgid "Archive directory %spartial is missing." msgstr "" --#: apt-pkg/acquire.cc:821 ++#: apt-pkg/acquire.cc:817 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@@ -2235,12 -2223,12 +2214,12 @@@ msgstr " msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" - #: apt-pkg/init.cc:123 -#: apt-pkg/init.cc:120 ++#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" - #: apt-pkg/init.cc:139 -#: apt-pkg/init.cc:136 ++#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2372,32 -2346,31 +2351,32 @@@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 +#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635 - #: apt-pkg/acquire-item.cc:1339 ++#: apt-pkg/acquire-item.cc:1336 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:1147 -#: apt-pkg/acquire-item.cc:719 ++#: apt-pkg/acquire-item.cc:1150 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:1206 -#: apt-pkg/acquire-item.cc:778 ++#: apt-pkg/acquire-item.cc:1203 #, 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:1242 -#: apt-pkg/acquire-item.cc:814 ++#: apt-pkg/acquire-item.cc:1239 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:1329 -#: apt-pkg/acquire-item.cc:901 ++#: apt-pkg/acquire-item.cc:1326 msgid "Size mismatch" msgstr "" @@@ -2547,3 -2518,7 +2526,11 @@@ msgstr " #, c-format msgid "Removed with config %s" msgstr "" + ++#: methods/rred.cc:219 ++msgid "Could not patch file" ++msgstr "" ++ + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "" diff --cc po/bs.po index 0cb31f3e8,e8a9c9672..966e86bc4 --- 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-11-30 08:37+0100\n" -"POT-Creation-Date: 2006-01-04 18:51+0100\n" ++"POT-Creation-Date: 2005-10-17 19:31+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@@ -14,145 -14,145 +14,155 @@@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" --#: cmdline/apt-cache.cc:135 ++#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n" --#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 --#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 --#: cmdline/apt-cache.cc:1508 ++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 ++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 ++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" --#: cmdline/apt-cache.cc:232 ++#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Ukupno naziva paketa:" --#: cmdline/apt-cache.cc:272 ++#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normalni paketi:" --#: cmdline/apt-cache.cc:273 ++#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Čisto virtuelni paketi:" --#: cmdline/apt-cache.cc:274 ++#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Pojedinačni virutuelni paketi:" --#: cmdline/apt-cache.cc:275 ++#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " MijeÅ¡ani virtuelni paketi:" --#: cmdline/apt-cache.cc:276 ++#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Nedostajući:" --#: cmdline/apt-cache.cc:278 ++#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Ukupno različitih verzija:" --#: cmdline/apt-cache.cc:280 ++#: cmdline/apt-cache.cc:293 ++#, fuzzy ++msgid "Total Distinct Descriptions: " ++msgstr "Ukupno različitih verzija:" ++ ++#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Ukupno zavisnosti:" --#: cmdline/apt-cache.cc:283 ++#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Ukupno Verzija/Datoteka odnosa:" --#: cmdline/apt-cache.cc:285 ++#: cmdline/apt-cache.cc:300 ++#, fuzzy ++msgid "Total Desc/File relations: " ++msgstr "Ukupno Verzija/Datoteka odnosa:" ++ ++#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "" --#: cmdline/apt-cache.cc:297 ++#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "" --#: cmdline/apt-cache.cc:311 ++#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "" --#: cmdline/apt-cache.cc:316 ++#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "" --#: cmdline/apt-cache.cc:324 ++#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "" --#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 ++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "" --#: cmdline/apt-cache.cc:1231 ++#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" --#: cmdline/apt-cache.cc:1385 ++#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Paketi nisu pronađeni" --#: cmdline/apt-cache.cc:1462 ++#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Datoteke paketa:" --#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 ++#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" --#: cmdline/apt-cache.cc:1470 ++#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins --#: cmdline/apt-cache.cc:1482 ++#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" --#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 ++#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "" #. Installed version --#: cmdline/apt-cache.cc:1515 ++#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalirano:" --#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 ++#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version --#: cmdline/apt-cache.cc:1522 ++#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" --#: cmdline/apt-cache.cc:1532 ++#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables --#: cmdline/apt-cache.cc:1541 ++#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" --#: cmdline/apt-cache.cc:1556 ++#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" --#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 ++#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" --#: cmdline/apt-cache.cc:1658 ++#: cmdline/apt-cache.cc:1720 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -191,18 -191,18 +201,6 @@@ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" --#: cmdline/apt-cdrom.cc:78 --msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" --msgstr "" -- --#: cmdline/apt-cdrom.cc:93 --msgid "Please insert a Disc in the drive and press enter" --msgstr "" -- --#: cmdline/apt-cdrom.cc:117 --msgid "Repeat this process for the rest of the CDs in your set." --msgstr "" -- #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenti nisu u parovima" @@@ -254,7 -254,7 +252,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:815 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@@ -438,12 -438,12 +436,12 @@@ msgstr " msgid "Archive had no package field" msgstr "" --#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 ++#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 #, c-format msgid " %s has no override entry\n" msgstr "" --#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 ++#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" @@@ -547,7 -547,7 +545,7 @@@ msgstr " msgid "Y" msgstr "" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 ++#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -708,11 -708,11 +706,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" - #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 ++#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 ++#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@@ -741,7 -741,7 +739,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 ++#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -776,7 -776,7 +774,7 @@@ msgstr "Odustani. msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" - #: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 ++#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -785,7 -785,7 +783,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 ++#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 msgid "Download complete and in download only mode" msgstr "" @@@ -877,45 -877,45 +875,45 @@@ msgstr " msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1311 -#: cmdline/apt-get.cc:1313 ++#: cmdline/apt-get.cc:1284 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 ++#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1382 -#: cmdline/apt-get.cc:1384 ++#: cmdline/apt-get.cc:1355 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1401 -#: cmdline/apt-get.cc:1403 ++#: cmdline/apt-get.cc:1374 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 ++#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1523 -#: cmdline/apt-get.cc:1525 ++#: cmdline/apt-get.cc:1496 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1553 -#: cmdline/apt-get.cc:1555 ++#: cmdline/apt-get.cc:1526 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1556 -#: cmdline/apt-get.cc:1558 ++#: cmdline/apt-get.cc:1529 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1568 -#: cmdline/apt-get.cc:1570 ++#: cmdline/apt-get.cc:1541 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" @@@ -923,158 -923,163 +921,158 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1576 -#: cmdline/apt-get.cc:1578 ++#: cmdline/apt-get.cc:1549 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:1581 -#: cmdline/apt-get.cc:1583 ++#: cmdline/apt-get.cc:1554 msgid "The following information may help to resolve the situation:" msgstr "" - #: cmdline/apt-get.cc:1584 -#: cmdline/apt-get.cc:1586 ++#: cmdline/apt-get.cc:1557 msgid "Broken packages" msgstr "OÅ¡tećeni paketi" - #: cmdline/apt-get.cc:1610 -#: cmdline/apt-get.cc:1612 ++#: cmdline/apt-get.cc:1583 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1683 ++#: cmdline/apt-get.cc:1654 msgid "Suggested packages:" msgstr "Predloženi paketi:" - #: cmdline/apt-get.cc:1682 -#: cmdline/apt-get.cc:1684 ++#: cmdline/apt-get.cc:1655 msgid "Recommended packages:" msgstr "Preporučeni paketi:" - #: cmdline/apt-get.cc:1702 -#: cmdline/apt-get.cc:1704 ++#: cmdline/apt-get.cc:1675 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." - #: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "NeuspjeÅ¡no" - #: cmdline/apt-get.cc:1710 -#: cmdline/apt-get.cc:1712 ++#: cmdline/apt-get.cc:1683 msgid "Done" msgstr "Urađeno" - #: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 ++#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:1883 -#: cmdline/apt-get.cc:1885 ++#: cmdline/apt-get.cc:1856 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 ++#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1957 -#: cmdline/apt-get.cc:1959 -#, c-format -msgid "Skiping already downloaded file '%s'\n" -msgstr "" - -#: cmdline/apt-get.cc:1983 ++#: cmdline/apt-get.cc:1930 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1962 -#: cmdline/apt-get.cc:1988 ++#: cmdline/apt-get.cc:1935 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1965 -#: cmdline/apt-get.cc:1991 ++#: cmdline/apt-get.cc:1938 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1971 -#: cmdline/apt-get.cc:1997 ++#: cmdline/apt-get.cc:1944 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2002 -#: cmdline/apt-get.cc:2028 ++#: cmdline/apt-get.cc:1975 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2056 ++#: cmdline/apt-get.cc:2003 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2042 -#: cmdline/apt-get.cc:2068 ++#: cmdline/apt-get.cc:2015 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2043 -#: cmdline/apt-get.cc:2069 ++#: cmdline/apt-get.cc:2016 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2060 -#: cmdline/apt-get.cc:2086 ++#: cmdline/apt-get.cc:2033 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2079 -#: cmdline/apt-get.cc:2105 ++#: cmdline/apt-get.cc:2052 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2095 -#: cmdline/apt-get.cc:2121 ++#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2123 -#: cmdline/apt-get.cc:2149 ++#: cmdline/apt-get.cc:2096 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2143 -#: cmdline/apt-get.cc:2169 ++#: cmdline/apt-get.cc:2116 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2195 -#: cmdline/apt-get.cc:2221 ++#: cmdline/apt-get.cc:2168 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2247 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2220 #, 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:2282 -#: cmdline/apt-get.cc:2308 ++#: cmdline/apt-get.cc:2255 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2307 -#: cmdline/apt-get.cc:2333 ++#: cmdline/apt-get.cc:2280 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2347 ++#: cmdline/apt-get.cc:2294 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2325 -#: cmdline/apt-get.cc:2351 ++#: cmdline/apt-get.cc:2298 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2357 -#: cmdline/apt-get.cc:2383 ++#: cmdline/apt-get.cc:2330 msgid "Supported modules:" msgstr "Podržani moduli:" - #: cmdline/apt-get.cc:2398 -#: cmdline/apt-get.cc:2424 ++#: cmdline/apt-get.cc:2371 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1275,7 -1280,7 +1273,7 @@@ msgstr " msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" --#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 ++#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" msgstr "" @@@ -1328,8 -1333,8 +1326,7 @@@ 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/sourcelist.cc:324 --#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" @@@ -1359,9 -1364,9 +1356,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:748 ++#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 ++#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Čitam spiskove paketa" @@@ -1496,11 -1501,11 +1493,12 @@@ msgid "File not found msgstr "Datoteka nije pronađena" #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 --#: methods/gzip.cc:142 ++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "" #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 ++#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@@ -1627,7 -1632,7 +1625,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" --#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 ++#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1758,76 -1763,76 +1756,76 @@@ msgstr " msgid "Read error from %s process" msgstr "" --#: methods/http.cc:381 ++#: methods/http.cc:345 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" --#: methods/http.cc:527 ++#: methods/http.cc:491 #, c-format msgid "Got a single header line over %u chars" msgstr "" --#: methods/http.cc:535 ++#: methods/http.cc:499 msgid "Bad header line" msgstr "" --#: methods/http.cc:554 methods/http.cc:561 ++#: methods/http.cc:518 methods/http.cc:525 msgid "The HTTP server sent an invalid reply header" msgstr "" --#: methods/http.cc:590 ++#: methods/http.cc:554 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" --#: methods/http.cc:605 ++#: methods/http.cc:569 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" --#: methods/http.cc:607 ++#: methods/http.cc:571 msgid "This HTTP server has broken range support" msgstr "" --#: methods/http.cc:631 ++#: methods/http.cc:595 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" --#: methods/http.cc:778 ++#: methods/http.cc:742 msgid "Select failed" msgstr "" --#: methods/http.cc:783 ++#: methods/http.cc:747 msgid "Connection timed out" msgstr "" --#: methods/http.cc:806 ++#: methods/http.cc:770 msgid "Error writing to output file" msgstr "" --#: methods/http.cc:837 ++#: methods/http.cc:798 msgid "Error writing to file" msgstr "" --#: methods/http.cc:865 ++#: methods/http.cc:823 msgid "Error writing to the file" msgstr "" --#: methods/http.cc:879 ++#: methods/http.cc:837 msgid "Error reading from server. Remote end closed connection" msgstr "" --#: methods/http.cc:881 ++#: methods/http.cc:839 msgid "Error reading from server" msgstr "" --#: methods/http.cc:1112 ++#: methods/http.cc:1070 msgid "Bad header data" msgstr "" --#: methods/http.cc:1129 ++#: methods/http.cc:1087 msgid "Connection failed" msgstr "Povezivanje neuspjeÅ¡no" --#: methods/http.cc:1220 ++#: methods/http.cc:1178 msgid "Internal error" msgstr "UnutraÅ¡nja greÅ¡ka" @@@ -1840,7 -1845,7 +1838,7 @@@ msgstr " msgid "Couldn't make mmap of %lu bytes" msgstr "" --#: apt-pkg/contrib/strutl.cc:938 ++#: apt-pkg/contrib/strutl.cc:984 #, c-format msgid "Selection %s not found" msgstr "" @@@ -1961,7 -1966,7 +1959,7 @@@ msgstr " msgid "Unable to stat the mount point %s" msgstr "" --#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 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 "" @@@ -2037,73 -2042,73 +2035,73 @@@ msgstr " msgid "Problem syncing the file" msgstr "" --#: apt-pkg/pkgcache.cc:126 ++#: apt-pkg/pkgcache.cc:135 msgid "Empty package cache" msgstr "" --#: apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:141 msgid "The package cache file is corrupted" msgstr "" --#: apt-pkg/pkgcache.cc:137 ++#: apt-pkg/pkgcache.cc:146 msgid "The package cache file is an incompatible version" msgstr "" --#: apt-pkg/pkgcache.cc:142 ++#: apt-pkg/pkgcache.cc:151 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" --#: apt-pkg/pkgcache.cc:147 ++#: apt-pkg/pkgcache.cc:156 msgid "The package cache was built for a different architecture" msgstr "" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Depends" msgstr "Zavisi" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "PreDepends" msgstr "Unaprijed zavisi" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Suggests" msgstr "Predlaže" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Recommends" msgstr "Preporučuje" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 #, fuzzy msgid "Conflicts" msgstr "Sukobljava se sa" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Replaces" msgstr "Zamjenjuje" --#: apt-pkg/pkgcache.cc:220 ++#: apt-pkg/pkgcache.cc:229 msgid "Obsoletes" msgstr "Zastarijeva" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "important" msgstr "važno" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "required" msgstr "zahtijevano" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "standard" msgstr "standardno" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "optional" msgstr "opcionalno" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "extra" msgstr "extra" @@@ -2129,52 -2134,52 +2127,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:94 ++#: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:96 ++#: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:99 ++#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:112 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:203 ++#: apt-pkg/sourcelist.cc:156 #, c-format msgid "Opening %s" msgstr "Otvaram %s" --#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:240 ++#: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:244 ++#: apt-pkg/sourcelist.cc:191 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" --#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 ++#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2218,7 -2223,7 +2216,7 @@@ msgstr " msgid "Archive directory %spartial is missing." msgstr "" --#: apt-pkg/acquire.cc:821 ++#: apt-pkg/acquire.cc:817 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@@ -2238,12 -2243,12 +2236,12 @@@ msgstr " msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" --#: apt-pkg/init.cc:120 ++#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:136 ++#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2286,106 -2291,106 +2284,121 @@@ msgstr " msgid "Error occurred while processing %s (NewPackage)" msgstr "" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:132 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:155 ++#, c-format ++msgid "Error occured while processing %s (NewFileDesc1)" ++msgstr "" ++ ++#: apt-pkg/pkgcachegen.cc:180 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:215 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:219 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:223 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:247 ++#, c-format ++msgid "Error occured while processing %s (NewFileDesc2)" ++msgstr "" ++ ++#: apt-pkg/pkgcachegen.cc:253 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:256 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:259 ++msgid "Wow, you exceeded the number of descriptions this APT is capable of." ++msgstr "" ++ ++#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:290 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:303 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:309 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:679 #, c-format msgid "Couldn't stat source package list %s" msgstr "" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "" --#: apt-pkg/acquire-item.cc:126 ++#: apt-pkg/acquire-item.cc:129 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" --#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 ++#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635 ++#: apt-pkg/acquire-item.cc:1336 msgid "MD5Sum mismatch" msgstr "" --#: apt-pkg/acquire-item.cc:719 ++#: apt-pkg/acquire-item.cc:1150 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" --#: apt-pkg/acquire-item.cc:778 ++#: apt-pkg/acquire-item.cc:1203 #, 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:814 ++#: apt-pkg/acquire-item.cc:1239 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" --#: apt-pkg/acquire-item.cc:901 ++#: apt-pkg/acquire-item.cc:1326 msgid "Size mismatch" msgstr "" @@@ -2394,94 -2399,94 +2407,96 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "" --#: apt-pkg/cdrom.cc:507 ++#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" --#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 ++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" --#: apt-pkg/cdrom.cc:541 ++#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "" --#: apt-pkg/cdrom.cc:561 ++#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" --#: apt-pkg/cdrom.cc:579 ++#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" --#: apt-pkg/cdrom.cc:583 ++#: apt-pkg/cdrom.cc:607 #, fuzzy msgid "Waiting for disc...\n" msgstr "Čekam na zaglavlja" #. Mount the new CDROM --#: apt-pkg/cdrom.cc:591 ++#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" --#: apt-pkg/cdrom.cc:609 ++#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" --#: apt-pkg/cdrom.cc:647 ++#: apt-pkg/cdrom.cc:673 #, c-format --msgid "Found %i package indexes, %i source indexes and %i signatures\n" ++msgid "" ++"Found %i package indexes, %i source indexes, %i translation indexes and %i " ++"signatures\n" msgstr "" --#: apt-pkg/cdrom.cc:710 ++#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" --#: apt-pkg/cdrom.cc:726 ++#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" --#: apt-pkg/cdrom.cc:730 ++#: apt-pkg/cdrom.cc:757 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" --#: apt-pkg/cdrom.cc:754 ++#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" --#: apt-pkg/cdrom.cc:763 ++#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" --#: apt-pkg/cdrom.cc:803 ++#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "" --#: apt-pkg/indexcopy.cc:261 ++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" --#: apt-pkg/indexcopy.cc:263 ++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" --#: apt-pkg/indexcopy.cc:266 ++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" --#: apt-pkg/indexcopy.cc:269 ++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@@ -2536,6 -2541,6 +2551,10 @@@ msgstr " msgid "Removed with config %s" msgstr "" ++#: methods/rred.cc:219 ++msgid "Could not patch file" ++msgstr "" ++ #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" diff --cc po/ca.po index b0b35e935,77e002c49..5ac160a8c --- 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-11-30 08:37+0100\n" -"POT-Creation-Date: 2006-01-04 18:51+0100\n" ++"POT-Creation-Date: 2005-10-17 19:31+0200\n" "PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@@ -16,146 -16,146 +16,156 @@@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" --#: cmdline/apt-cache.cc:135 ++#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquet %s versió %s té una dependència sense satisfer:\n" --#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 --#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 --#: cmdline/apt-cache.cc:1508 ++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 ++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 ++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" --#: cmdline/apt-cache.cc:232 ++#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Nombre total de paquets: " --#: cmdline/apt-cache.cc:272 ++#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Paquets normals: " --#: cmdline/apt-cache.cc:273 ++#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Paquets virtuals purs: " --#: cmdline/apt-cache.cc:274 ++#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Paquets virtuals únics: " --#: cmdline/apt-cache.cc:275 ++#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Paquets virtuals mixtes: " --#: cmdline/apt-cache.cc:276 ++#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Falten: " --#: cmdline/apt-cache.cc:278 ++#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Total de versions diferents: " --#: cmdline/apt-cache.cc:280 ++#: cmdline/apt-cache.cc:293 ++#, fuzzy ++msgid "Total Distinct Descriptions: " ++msgstr "Total de versions diferents: " ++ ++#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Total de dependències: " --#: cmdline/apt-cache.cc:283 ++#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Total de relacions versió/fitxer: " --#: cmdline/apt-cache.cc:285 ++#: cmdline/apt-cache.cc:300 ++#, fuzzy ++msgid "Total Desc/File relations: " ++msgstr "Total de relacions versió/fitxer: " ++ ++#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Total dels mapes aportats: " --#: cmdline/apt-cache.cc:297 ++#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Total de cadenes globals: " --#: cmdline/apt-cache.cc:311 ++#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total de l'espai per a dependències de versió: " --#: cmdline/apt-cache.cc:316 ++#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Total de l'espai desperdiciat: " --#: cmdline/apt-cache.cc:324 ++#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total de l'espai atribuit a: " --#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 ++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." --#: cmdline/apt-cache.cc:1231 ++#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Heu de donar exactament un patró" --#: cmdline/apt-cache.cc:1385 ++#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "No s'han trobat paquets" --#: cmdline/apt-cache.cc:1462 ++#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Fitxers de paquets:" --#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 ++#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet" --#: cmdline/apt-cache.cc:1470 ++#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins --#: cmdline/apt-cache.cc:1482 ++#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paquets etiquetats:" --#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 ++#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(no trobat)" #. Installed version --#: cmdline/apt-cache.cc:1515 ++#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instal·lat: " --#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 ++#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(cap)" #. Candidate Version --#: cmdline/apt-cache.cc:1522 ++#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidat: " --#: cmdline/apt-cache.cc:1532 ++#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Etiqueta del paquet: " #. Show the priority tables --#: cmdline/apt-cache.cc:1541 ++#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Taula de versió:" --#: cmdline/apt-cache.cc:1556 ++#: cmdline/apt-cache.cc:1618 #, c-format 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-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2325 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" --#: cmdline/apt-cache.cc:1658 ++#: cmdline/apt-cache.cc:1720 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -230,22 -230,22 +240,6 @@@ msgstr " "Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més " "informació.\n" --#: cmdline/apt-cdrom.cc:78 --msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" --msgstr "" -- --#: cmdline/apt-cdrom.cc:93 --#, fuzzy --msgid "Please insert a Disc in the drive and press enter" --msgstr "" --"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n" --" '%s'\n" --"en la unitat de '%s' i premeu Intro\n" -- --#: cmdline/apt-cdrom.cc:117 --msgid "Repeat this process for the rest of the CDs in your set." --msgstr "" -- #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Els arguments no són en parells" @@@ -307,7 -307,7 +301,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:815 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@@ -529,12 -529,12 +523,12 @@@ msgstr "No es pot determinar l'estat d msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" --#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 ++#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" --#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 ++#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" @@@ -638,7 -638,7 +632,7 @@@ msgstr "No s'ha pogut canviar el nom d msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 ++#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@@ -801,11 -801,11 +795,11 @@@ msgstr "Els paquets necessiten ser elim msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" - #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 ++#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" - #: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 ++#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 #: 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." @@@ -835,7 -835,7 +829,7 @@@ msgstr "Després de desempaquetar s'usa msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" - #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 ++#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@@ -872,7 -872,7 +866,7 @@@ msgstr "Avortat. msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " - #: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 ++#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@@ -881,7 -881,7 +875,7 @@@ msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" - #: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 ++#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" @@@ -980,15 -980,15 +974,15 @@@ msgstr "No s'ha trobat la versió «%s msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" - #: cmdline/apt-get.cc:1311 -#: cmdline/apt-get.cc:1313 ++#: cmdline/apt-get.cc:1284 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" - #: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 ++#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" - #: cmdline/apt-get.cc:1382 -#: cmdline/apt-get.cc:1384 ++#: cmdline/apt-get.cc:1355 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -996,25 -996,25 +990,25 @@@ 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:1401 -#: cmdline/apt-get.cc:1403 ++#: cmdline/apt-get.cc:1374 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" - #: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 ++#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" - #: cmdline/apt-get.cc:1523 -#: cmdline/apt-get.cc:1525 ++#: cmdline/apt-get.cc:1496 #, 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:1553 -#: cmdline/apt-get.cc:1555 ++#: cmdline/apt-get.cc:1526 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:1556 -#: cmdline/apt-get.cc:1558 ++#: cmdline/apt-get.cc:1529 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1022,7 -1022,7 +1016,7 @@@ msgstr " "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." - #: cmdline/apt-get.cc:1568 -#: cmdline/apt-get.cc:1570 ++#: cmdline/apt-get.cc:1541 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" @@@ -1034,7 -1034,7 +1028,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:1576 -#: cmdline/apt-get.cc:1578 ++#: cmdline/apt-get.cc:1549 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" @@@ -1044,119 -1044,125 +1038,119 @@@ 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:1581 -#: cmdline/apt-get.cc:1583 ++#: cmdline/apt-get.cc:1554 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:1584 -#: cmdline/apt-get.cc:1586 ++#: cmdline/apt-get.cc:1557 msgid "Broken packages" msgstr "Paquets trencats" - #: cmdline/apt-get.cc:1610 -#: cmdline/apt-get.cc:1612 ++#: cmdline/apt-get.cc:1583 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1683 ++#: cmdline/apt-get.cc:1654 msgid "Suggested packages:" msgstr "Paquets suggerits:" - #: cmdline/apt-get.cc:1682 -#: cmdline/apt-get.cc:1684 ++#: cmdline/apt-get.cc:1655 msgid "Recommended packages:" msgstr "Paquets recomanats:" - #: cmdline/apt-get.cc:1702 -#: cmdline/apt-get.cc:1704 ++#: cmdline/apt-get.cc:1675 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " - #: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ha fallat" - #: cmdline/apt-get.cc:1710 -#: cmdline/apt-get.cc:1712 ++#: cmdline/apt-get.cc:1683 msgid "Done" msgstr "Fet" - #: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 ++#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 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:1883 -#: cmdline/apt-get.cc:1885 ++#: cmdline/apt-get.cc:1856 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:1910 cmdline/apt-get.cc:2118 -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 ++#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 #, 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:1957 -#: cmdline/apt-get.cc:1959 -#, fuzzy, c-format -msgid "Skiping already downloaded file '%s'\n" -msgstr "" -"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" - -#: cmdline/apt-get.cc:1983 ++#: cmdline/apt-get.cc:1930 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" - #: cmdline/apt-get.cc:1962 -#: cmdline/apt-get.cc:1988 ++#: cmdline/apt-get.cc:1935 #, 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:1965 -#: cmdline/apt-get.cc:1991 ++#: cmdline/apt-get.cc:1938 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" - #: cmdline/apt-get.cc:1971 -#: cmdline/apt-get.cc:1997 ++#: cmdline/apt-get.cc:1944 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" - #: cmdline/apt-get.cc:2002 -#: cmdline/apt-get.cc:2028 ++#: cmdline/apt-get.cc:1975 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2056 ++#: cmdline/apt-get.cc:2003 #, 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:2042 -#: cmdline/apt-get.cc:2068 ++#: cmdline/apt-get.cc:2015 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" - #: cmdline/apt-get.cc:2043 -#: cmdline/apt-get.cc:2069 ++#: cmdline/apt-get.cc:2016 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2060 -#: cmdline/apt-get.cc:2086 ++#: cmdline/apt-get.cc:2033 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" - #: cmdline/apt-get.cc:2079 -#: cmdline/apt-get.cc:2105 ++#: cmdline/apt-get.cc:2052 msgid "Child process failed" msgstr "Ha fallat el procés fill" - #: cmdline/apt-get.cc:2095 -#: cmdline/apt-get.cc:2121 ++#: cmdline/apt-get.cc:2068 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:2123 -#: cmdline/apt-get.cc:2149 ++#: cmdline/apt-get.cc:2096 #, 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:2143 -#: cmdline/apt-get.cc:2169 ++#: cmdline/apt-get.cc:2116 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" - #: cmdline/apt-get.cc:2195 -#: cmdline/apt-get.cc:2221 ++#: cmdline/apt-get.cc:2168 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1165,7 -1171,7 +1159,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:2247 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2220 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1174,32 -1180,32 +1168,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:2282 -#: cmdline/apt-get.cc:2308 ++#: cmdline/apt-get.cc:2255 #, 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:2307 -#: cmdline/apt-get.cc:2333 ++#: cmdline/apt-get.cc:2280 #, 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:2321 -#: cmdline/apt-get.cc:2347 ++#: cmdline/apt-get.cc:2294 #, 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:2325 -#: cmdline/apt-get.cc:2351 ++#: cmdline/apt-get.cc:2298 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" - #: cmdline/apt-get.cc:2357 -#: cmdline/apt-get.cc:2383 ++#: cmdline/apt-get.cc:2330 msgid "Supported modules:" msgstr "Mòduls suportats:" - #: cmdline/apt-get.cc:2398 -#: cmdline/apt-get.cc:2424 ++#: cmdline/apt-get.cc:2371 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1457,7 -1463,7 +1451,7 @@@ msgstr "Fitxer de conf. duplicat %s/%s msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" --#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 ++#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" @@@ -1510,8 -1516,8 +1504,7 @@@ msgid "File %s/%s overwrites the one i msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 --#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 --#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@@ -1543,9 -1549,9 +1536,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:748 ++#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 ++#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" @@@ -1684,11 -1690,11 +1677,12 @@@ msgid "File not found msgstr "Fitxer no trobat" #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 --#: methods/gzip.cc:142 ++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "L'estat ha fallat" #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 ++#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@@ -1817,7 -1823,7 +1811,7 @@@ msgstr "S'ha esgotat el temps de connex msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" --#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 ++#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@@ -1953,76 -1959,76 +1947,76 @@@ msgstr "No s'ha pogut obrir un conduct msgid "Read error from %s process" msgstr "Error llegint des del procés %s" --#: methods/http.cc:381 ++#: methods/http.cc:345 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" --#: methods/http.cc:527 ++#: methods/http.cc:491 #, c-format msgid "Got a single header line over %u chars" msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters" --#: methods/http.cc:535 ++#: methods/http.cc:499 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" --#: methods/http.cc:554 methods/http.cc:561 ++#: methods/http.cc:518 methods/http.cc:525 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor http ha enviat una capçalera de resposta no vàlida" --#: methods/http.cc:590 ++#: methods/http.cc:554 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida" --#: methods/http.cc:605 ++#: methods/http.cc:569 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida" --#: methods/http.cc:607 ++#: methods/http.cc:571 msgid "This HTTP server has broken range support" msgstr "Aquest servidor http té el suport d'abast trencat" --#: methods/http.cc:631 ++#: methods/http.cc:595 msgid "Unknown date format" msgstr "Format de la data desconegut" --#: methods/http.cc:778 ++#: methods/http.cc:742 msgid "Select failed" msgstr "Ha fallat la selecció" --#: methods/http.cc:783 ++#: methods/http.cc:747 msgid "Connection timed out" msgstr "Connexió finalitzada" --#: methods/http.cc:806 ++#: methods/http.cc:770 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" --#: methods/http.cc:837 ++#: methods/http.cc:798 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" --#: methods/http.cc:865 ++#: methods/http.cc:823 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" --#: methods/http.cc:879 ++#: methods/http.cc:837 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" --#: methods/http.cc:881 ++#: methods/http.cc:839 msgid "Error reading from server" msgstr "Error llegint des del servidor" --#: methods/http.cc:1112 ++#: methods/http.cc:1070 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" --#: methods/http.cc:1129 ++#: methods/http.cc:1087 msgid "Connection failed" msgstr "Ha fallat la connexió" --#: methods/http.cc:1220 ++#: methods/http.cc:1178 msgid "Internal error" msgstr "Error intern" @@@ -2035,7 -2041,7 +2029,7 @@@ msgstr "No es pot transferir un fitxer msgid "Couldn't make mmap of %lu bytes" msgstr "No s'ha pogut crear un mapa de memòria de %lu octets" --#: apt-pkg/contrib/strutl.cc:938 ++#: apt-pkg/contrib/strutl.cc:984 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" @@@ -2156,7 -2162,7 +2150,7 @@@ msgstr "Operació no vàlida %s msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" --#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 ++#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "No es pot canviar a %s" @@@ -2232,72 -2238,72 +2226,72 @@@ msgstr "Ha hagut un problema en desenll msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" --#: apt-pkg/pkgcache.cc:126 ++#: apt-pkg/pkgcache.cc:135 msgid "Empty package cache" msgstr "Memòria cau de paquets és buida" --#: apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:141 msgid "The package cache file is corrupted" msgstr "El fitxer de memòria cau de paquets està corromput" --#: apt-pkg/pkgcache.cc:137 ++#: apt-pkg/pkgcache.cc:146 msgid "The package cache file is an incompatible version" msgstr "El fitxer de memòria cau de paquets és una versió incompatible" --#: apt-pkg/pkgcache.cc:142 ++#: apt-pkg/pkgcache.cc:151 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Aquest APT no suporta el sistema de versions '%s'" --#: apt-pkg/pkgcache.cc:147 ++#: apt-pkg/pkgcache.cc:156 msgid "The package cache was built for a different architecture" msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Depends" msgstr "Depén" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "PreDepends" msgstr "Predepén" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Suggests" msgstr "Suggereix" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Recommends" msgstr "Recomana" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Conflicts" msgstr "Entra en conflicte" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Replaces" msgstr "Reemplaça" --#: apt-pkg/pkgcache.cc:220 ++#: apt-pkg/pkgcache.cc:229 msgid "Obsoletes" msgstr "Fa obsolet" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "important" msgstr "important" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "required" msgstr "requerit" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "standard" msgstr "estàndard" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "optional" msgstr "opcional" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "extra" msgstr "extra" @@@ -2323,52 -2329,52 +2317,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:94 ++#: apt-pkg/sourcelist.cc:87 #, 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:96 ++#: apt-pkg/sourcelist.cc:89 #, 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:99 ++#: apt-pkg/sourcelist.cc:92 #, 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:105 ++#: apt-pkg/sourcelist.cc:98 #, 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:112 ++#: apt-pkg/sourcelist.cc:105 #, 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:203 ++#: apt-pkg/sourcelist.cc:156 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" --#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450 #, 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:240 ++#: apt-pkg/sourcelist.cc:187 #, 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:244 ++#: apt-pkg/sourcelist.cc:191 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" --#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 ++#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, 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)" @@@ -2421,7 -2427,7 +2415,7 @@@ msgstr "Falta el directori de llistes % msgid "Archive directory %spartial is missing." msgstr "Falta el directori d'arxiu %spartial." --#: apt-pkg/acquire.cc:821 ++#: apt-pkg/acquire.cc:817 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@@ -2444,12 -2450,12 +2438,12 @@@ msgstr " " '%s'\n" "en la unitat de '%s' i premeu Intro\n" --#: apt-pkg/init.cc:120 ++#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament '%s' no està suportat." --#: apt-pkg/init.cc:136 ++#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@@ -2494,90 -2500,90 +2488,107 @@@ msgstr "La memòria cau té un sistema 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:132 #, 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:155 ++#, fuzzy, c-format ++msgid "Error occured while processing %s (NewFileDesc1)" ++msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" ++ ++#: apt-pkg/pkgcachegen.cc:180 #, 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:184 #, 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:215 #, 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:219 #, 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:223 #, 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:247 ++#, fuzzy, c-format ++msgid "Error occured while processing %s (NewFileDesc2)" ++msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" ++ ++#: apt-pkg/pkgcachegen.cc:253 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:256 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:259 ++#, fuzzy ++msgid "Wow, you exceeded the number of descriptions this APT is capable of." ++msgstr "" ++"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. " ++ ++#: apt-pkg/pkgcachegen.cc:262 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:290 #, 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:303 #, 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:309 #, 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:679 #, 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:763 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:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" --#: apt-pkg/acquire-item.cc:126 ++#: apt-pkg/acquire-item.cc:129 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." --#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 ++#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635 ++#: apt-pkg/acquire-item.cc:1336 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" --#: apt-pkg/acquire-item.cc:719 ++#: apt-pkg/acquire-item.cc:1150 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2587,7 -2593,7 +2598,7 @@@ msgstr " "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." --#: apt-pkg/acquire-item.cc:778 ++#: apt-pkg/acquire-item.cc:1203 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2596,7 -2602,7 +2607,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:814 ++#: apt-pkg/acquire-item.cc:1239 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2604,7 -2610,7 +2615,7 @@@ msgstr " "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." --#: apt-pkg/acquire-item.cc:901 ++#: apt-pkg/acquire-item.cc:1326 msgid "Size mismatch" msgstr "Mida diferent" @@@ -2613,7 -2619,7 +2624,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "El camp del proveïdor %s no té una empremta digital" --#: apt-pkg/cdrom.cc:507 ++#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2622,47 -2628,47 +2633,49 @@@ msgstr " "S'està utilitzant el punt de muntatge de CD-ROM %s\n" "S'està muntant el CD-ROM\n" --#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 ++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "S'està identificant..." --#: apt-pkg/cdrom.cc:541 ++#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "S'ha emmagatzemat l'etiqueta: %s\n" --#: apt-pkg/cdrom.cc:561 ++#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" --#: apt-pkg/cdrom.cc:579 ++#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "S'està desmuntant el CD-ROM\n" --#: apt-pkg/cdrom.cc:583 ++#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc...\n" #. Mount the new CDROM --#: apt-pkg/cdrom.cc:591 ++#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM...\n" --#: apt-pkg/cdrom.cc:609 ++#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "S'està analitzant el disc per a fitxers d'índex...\n" --#: apt-pkg/cdrom.cc:647 --#, c-format --msgid "Found %i package indexes, %i source indexes and %i signatures\n" ++#: apt-pkg/cdrom.cc:673 ++#, fuzzy, c-format ++msgid "" ++"Found %i package indexes, %i source indexes, %i translation indexes and %i " ++"signatures\n" msgstr "S'han trobat %i índex de paquets, %i índex de fonts i %i signatures\n" --#: apt-pkg/cdrom.cc:710 ++#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" --#: apt-pkg/cdrom.cc:726 ++#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@@ -2671,38 -2677,38 +2684,38 @@@ msgstr " "El disc es diu:\n" "«%s»\n" --#: apt-pkg/cdrom.cc:730 ++#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets..." --#: apt-pkg/cdrom.cc:754 ++#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" --#: apt-pkg/cdrom.cc:763 ++#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" --#: apt-pkg/cdrom.cc:803 ++#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "S'esta desmuntant el CD-ROM..." --#: apt-pkg/indexcopy.cc:261 ++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" --#: apt-pkg/indexcopy.cc:263 ++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S'han escrit %i registres, on falten %i fitxers.\n" --#: apt-pkg/indexcopy.cc:266 ++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" --#: apt-pkg/indexcopy.cc:269 ++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@@ -2759,10 -2765,10 +2772,27 @@@ msgstr " msgid "Removed with config %s" msgstr "" ++#: methods/rred.cc:219 ++#, fuzzy ++msgid "Could not patch file" ++msgstr "No s'ha pogut obrir el fitxer %s" ++ #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" ++#, fuzzy ++#~ msgid "Please insert a Disc in the drive and press enter" ++#~ msgstr "" ++#~ "El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n" ++#~ " '%s'\n" ++#~ "en la unitat de '%s' i premeu Intro\n" ++ ++#, fuzzy ++#~ msgid "Skiping already downloaded file '%s'\n" ++#~ msgstr "" ++#~ "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" ++ #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s" diff --cc po/cs.po index e782cd293,c366ba611..efaac2f1e --- a/po/cs.po +++ b/po/cs.po @@@ -6,153 -6,153 +6,163 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-11-30 08:37+0100\n" - "PO-Revision-Date: 2005-02-11 16:14+0100\n" -"POT-Creation-Date: 2006-01-04 18:51+0100\n" ++"POT-Creation-Date: 2005-10-17 19:31+0200\n" + "PO-Revision-Date: 2005-12-30 15:44+0100\n" "Last-Translator: Miroslav Kure \n" - "Language-Team: Czech \n" + "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" --#: cmdline/apt-cache.cc:135 ++#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verze %s má nesplněné závislosti:\n" --#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 --#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 --#: cmdline/apt-cache.cc:1508 ++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 ++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 ++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Nemohu najít balík %s" --#: cmdline/apt-cache.cc:232 ++#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Celkem názvů balíků: " --#: cmdline/apt-cache.cc:272 ++#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normálních balíků: " --#: cmdline/apt-cache.cc:273 ++#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Čistě virtuálních balíků: " --#: cmdline/apt-cache.cc:274 ++#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálních balíků: " --#: cmdline/apt-cache.cc:275 ++#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Smíšených virtuálních balíků: " --#: cmdline/apt-cache.cc:276 ++#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Chybějících: " --#: cmdline/apt-cache.cc:278 ++#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Celkem různých verzí: " --#: cmdline/apt-cache.cc:280 ++#: cmdline/apt-cache.cc:293 ++#, fuzzy ++msgid "Total Distinct Descriptions: " ++msgstr "Celkem různých verzí: " ++ ++#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Celkem závislostí: " --#: cmdline/apt-cache.cc:283 ++#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Celkem vztahů ver/soubor: " --#: cmdline/apt-cache.cc:285 ++#: cmdline/apt-cache.cc:300 ++#, fuzzy ++msgid "Total Desc/File relations: " ++msgstr "Celkem vztahů ver/soubor: " ++ ++#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Celkem poskytnutých mapování: " --#: cmdline/apt-cache.cc:297 ++#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Celkem globovaných řetězců: " --#: cmdline/apt-cache.cc:311 ++#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Celkem místa závislých verzí: " --#: cmdline/apt-cache.cc:316 ++#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Celkem jalového místa: " --#: cmdline/apt-cache.cc:324 ++#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Celkem přiřazeného místa: " --#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 ++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Soubor balíku %s je Å¡patně synchronizovaný." --#: cmdline/apt-cache.cc:1231 ++#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Musíte zadat právě jeden vzor" --#: cmdline/apt-cache.cc:1385 ++#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" --#: cmdline/apt-cache.cc:1462 ++#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Soubory balíku:" --#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 ++#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku" --#: cmdline/apt-cache.cc:1470 ++#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins --#: cmdline/apt-cache.cc:1482 ++#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Vypíchnuté balíky:" --#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 ++#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nenalezeno)" #. Installed version --#: cmdline/apt-cache.cc:1515 ++#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalovaná verze: " --#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 ++#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(žádná)" #. Candidate Version --#: cmdline/apt-cache.cc:1522 ++#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidát: " --#: cmdline/apt-cache.cc:1532 ++#: cmdline/apt-cache.cc:1594 msgid " Package pin: " - msgstr " Vypíchnutý balík:" + msgstr " Vypíchnutý balík: " #. Show the priority tables --#: cmdline/apt-cache.cc:1541 ++#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabulka verzí:" --#: cmdline/apt-cache.cc:1556 ++#: cmdline/apt-cache.cc:1618 #, c-format 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-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2325 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" --#: cmdline/apt-cache.cc:1658 ++#: cmdline/apt-cache.cc:1720 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -226,22 -226,18 +236,6 @@@ msgstr " " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" "Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n" --#: cmdline/apt-cdrom.cc:78 --msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" - msgstr "" -msgstr "Zadejte prosím název tohoto média, např. 'Debian 2.1r1 Disk 1'" -- --#: cmdline/apt-cdrom.cc:93 - #, fuzzy --msgid "Please insert a Disc in the drive and press enter" - msgstr "" - "Výměna média: Vložte disk nazvaný\n" - " '%s'\n" - "do mechaniky '%s' a stiskněte enter\n" -msgstr "Vložte prosím médium do mechaniky a stiskněte enter" -- --#: cmdline/apt-cdrom.cc:117 --msgid "Repeat this process for the rest of the CDs in your set." - msgstr "" -msgstr "Tento proces opakujte pro vÅ¡echna zbývající média." -- #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenty nejsou v párech" @@@ -302,7 -298,7 +296,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:815 #, c-format msgid "Unable to write to %s" msgstr "Nemohu zapsat do %s" @@@ -522,14 -517,14 +515,14 @@@ msgstr "Nemohu vyhodnotit %s #: ftparchive/writer.cc:386 msgid "Archive had no package field" - msgstr "Archív nemá pole Package" + msgstr "Archiv nemá pole Package" --#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 ++#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" --#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 ++#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" @@@ -633,7 -628,7 +626,7 @@@ msgstr "Selhalo přejmenování %s na % msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 ++#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@@ -701,8 -696,7 +694,7 @@@ msgstr "Následující podržené balí msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:544 - #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -767,11 -761,11 +759,11 @@@ msgstr "Nesplněné závislosti. Zkust 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:693 +#: cmdline/apt-get.cc:691 msgid "Authentication warning overridden.\n" - msgstr "" + msgstr "Autentizační varování potlačeno.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " msgstr "Instalovat tyto balíky bez ověření [y/N]? " @@@ -783,43 -777,43 +775,43 @@@ msgstr "Některé balíky nemohly být 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:755 +#: cmdline/apt-get.cc:753 msgid "Internal error, InstallPackages was called with broken packages!" - msgstr "" + msgstr "Vnitřní chyba, InstallPackages byl zavolán s poruÅ¡enými balíky!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:762 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:775 +#: cmdline/apt-get.cc:773 - #, fuzzy msgid "Internal error, Ordering didn't finish" - msgstr "Vnitřní chyba při přidávání diverze" + msgstr "Vnitřní chyba, třídění nedoběhlo do konce" - #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 ++#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" - #: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 ++#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 #: 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:816 +#: cmdline/apt-get.cc:814 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" + "Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:819 #, c-format msgid "Need to get %sB/%sB of archives.\n" - msgstr "Potřebuji stáhnout %sB/%sB archívů.\n" + msgstr "Potřebuji stáhnout %sB/%sB archivů.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:822 #, c-format msgid "Need to get %sB of archives.\n" - msgstr "Potřebuji stáhnout %sB archívů.\n" + msgstr "Potřebuji stáhnout %sB archivů.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:827 #, 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" @@@ -829,17 -823,17 +821,17 @@@ msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" - #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 - #, fuzzy, c-format -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 ++#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 + #, c-format msgid "Couldn't determine free space in %s" - msgstr "Na %s nemáte dostatek volného místa" + msgstr "Nemohu určit volné místo v %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:847 #, c-format msgid "You don't have enough free space in %s." - msgstr "Na %s nemáte dostatek volného místa." + msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno 'pouze triviální', ovÅ¡em toto není triviální operace." @@@ -847,18 -841,18 +839,18 @@@ msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:866 - #, fuzzy, c-format + #, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" - "Chystáte se vykonat něco potenciálně Å¡kodlivého\n" + "Chystáte se vykonat něco potenciálně Å¡kodlivého.\n" "Pro pokračování opiÅ¡te frázi '%s'\n" - " ?]" + " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 msgid "Abort." msgstr "PřeruÅ¡eno." @@@ -866,7 -860,7 +858,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " - #: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 ++#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@@ -875,7 -869,7 +867,7 @@@ msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" - #: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 ++#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@@ -884,10 -878,10 +876,10 @@@ msgid " "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" - "Nemohu stáhnout některé archívy. Možná spusÅ¥te apt-get update nebo zkuste --" + "Nemohu stáhnout některé archivy. Možná spusÅ¥te apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:988 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" @@@ -972,15 -966,15 +964,15 @@@ msgstr "Verze '%s' pro '%s' nebyla nale msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" - #: cmdline/apt-get.cc:1311 -#: cmdline/apt-get.cc:1313 ++#: cmdline/apt-get.cc:1284 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" - #: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 ++#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" - #: cmdline/apt-get.cc:1382 -#: cmdline/apt-get.cc:1384 ++#: cmdline/apt-get.cc:1355 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -988,33 -982,33 +980,33 @@@ msgstr " "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " "použity starší verze." - #: cmdline/apt-get.cc:1401 -#: cmdline/apt-get.cc:1403 ++#: cmdline/apt-get.cc:1374 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" - #: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 ++#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" - #: cmdline/apt-get.cc:1523 -#: cmdline/apt-get.cc:1525 ++#: cmdline/apt-get.cc:1496 #, 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:1553 -#: cmdline/apt-get.cc:1555 ++#: cmdline/apt-get.cc:1526 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:1556 -#: cmdline/apt-get.cc:1558 ++#: cmdline/apt-get.cc:1529 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - "Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo " + "Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " "navrhněte řeÅ¡ení)." - #: cmdline/apt-get.cc:1568 -#: cmdline/apt-get.cc:1570 ++#: cmdline/apt-get.cc:1541 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" @@@ -1025,7 -1019,7 +1017,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:1576 -#: cmdline/apt-get.cc:1578 ++#: cmdline/apt-get.cc:1549 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" @@@ -1035,124 -1029,128 +1027,123 @@@ msgstr " "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1583 ++#: cmdline/apt-get.cc:1554 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:1584 -#: cmdline/apt-get.cc:1586 ++#: cmdline/apt-get.cc:1557 msgid "Broken packages" msgstr "PoÅ¡kozené balíky" - #: cmdline/apt-get.cc:1610 -#: cmdline/apt-get.cc:1612 ++#: cmdline/apt-get.cc:1583 msgid "The following extra packages will be installed:" - msgstr "Následujcící extra balíky budou instalovány:" + msgstr "Následující extra balíky budou instalovány:" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1683 ++#: cmdline/apt-get.cc:1654 msgid "Suggested packages:" msgstr "Navrhované balíky:" - #: cmdline/apt-get.cc:1682 -#: cmdline/apt-get.cc:1684 ++#: cmdline/apt-get.cc:1655 msgid "Recommended packages:" msgstr "Doporučované balíky:" - #: cmdline/apt-get.cc:1702 -#: cmdline/apt-get.cc:1704 ++#: cmdline/apt-get.cc:1675 msgid "Calculating upgrade... " - msgstr "Propočítávám aktualizaci..." + msgstr "Propočítávám aktualizaci... " - #: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Selhalo" - #: cmdline/apt-get.cc:1710 -#: cmdline/apt-get.cc:1712 ++#: cmdline/apt-get.cc:1683 msgid "Done" msgstr "Hotovo" - #: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 - #, fuzzy -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 ++#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 msgid "Internal error, problem resolver broke stuff" - msgstr "Vnitřní chyba, AllUpgrade pokazil věci" + msgstr "Vnitřní chyba, řeÅ¡itel problémů pokazil věci" - #: cmdline/apt-get.cc:1883 -#: cmdline/apt-get.cc:1885 ++#: cmdline/apt-get.cc:1856 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:1910 cmdline/apt-get.cc:2118 -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 ++#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" - #: cmdline/apt-get.cc:1957 -#: cmdline/apt-get.cc:1959 -#, fuzzy, c-format -msgid "Skiping already downloaded file '%s'\n" -msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" - -#: cmdline/apt-get.cc:1983 ++#: cmdline/apt-get.cc:1930 #, 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:1962 -#: cmdline/apt-get.cc:1988 ++#: cmdline/apt-get.cc:1935 #, c-format msgid "Need to get %sB/%sB of source archives.\n" - msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n" + msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" - #: cmdline/apt-get.cc:1965 -#: cmdline/apt-get.cc:1991 ++#: cmdline/apt-get.cc:1938 #, c-format msgid "Need to get %sB of source archives.\n" - msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n" + msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" - #: cmdline/apt-get.cc:1971 -#: cmdline/apt-get.cc:1997 ++#: cmdline/apt-get.cc:1944 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" - #: cmdline/apt-get.cc:2002 -#: cmdline/apt-get.cc:2028 ++#: cmdline/apt-get.cc:1975 msgid "Failed to fetch some archives." - msgstr "Stažení některých archívů selhalo." + msgstr "Stažení některých archivů selhalo." - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2056 ++#: cmdline/apt-get.cc:2003 #, 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:2042 -#: cmdline/apt-get.cc:2068 ++#: cmdline/apt-get.cc:2015 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" - #: cmdline/apt-get.cc:2043 -#: cmdline/apt-get.cc:2069 ++#: cmdline/apt-get.cc:2016 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" - msgstr "" + msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" - #: cmdline/apt-get.cc:2060 -#: cmdline/apt-get.cc:2086 ++#: cmdline/apt-get.cc:2033 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" - #: cmdline/apt-get.cc:2079 -#: cmdline/apt-get.cc:2105 ++#: cmdline/apt-get.cc:2052 msgid "Child process failed" msgstr "Synovský proces selhal" - #: cmdline/apt-get.cc:2095 -#: cmdline/apt-get.cc:2121 ++#: cmdline/apt-get.cc:2068 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:2123 -#: cmdline/apt-get.cc:2149 ++#: cmdline/apt-get.cc:2096 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" - #: cmdline/apt-get.cc:2143 -#: cmdline/apt-get.cc:2169 ++#: cmdline/apt-get.cc:2116 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" - #: cmdline/apt-get.cc:2195 -#: cmdline/apt-get.cc:2221 ++#: cmdline/apt-get.cc:2168 #, 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:2247 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2220 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1161,31 -1159,31 +1152,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:2282 -#: cmdline/apt-get.cc:2308 ++#: cmdline/apt-get.cc:2255 #, 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:2307 -#: cmdline/apt-get.cc:2333 ++#: cmdline/apt-get.cc:2280 #, 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:2321 -#: cmdline/apt-get.cc:2347 ++#: cmdline/apt-get.cc:2294 #, 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:2325 -#: cmdline/apt-get.cc:2351 ++#: cmdline/apt-get.cc:2298 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" - #: cmdline/apt-get.cc:2357 -#: cmdline/apt-get.cc:2383 ++#: cmdline/apt-get.cc:2330 msgid "Supported modules:" msgstr "Podporované moduly:" - #: cmdline/apt-get.cc:2398 -#: cmdline/apt-get.cc:2424 ++#: cmdline/apt-get.cc:2371 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1432,11 -1430,11 +1423,11 @@@ msgid "Duplicate conf file %s/%s msgstr "Duplicitní konfigurační soubor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 - #, fuzzy, c-format + #, c-format msgid "Failed to write file %s" - msgstr "Selhal zápis do souboru %s" + msgstr "Selhal zápis souboru %s" --#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 ++#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" @@@ -1489,8 -1487,8 +1480,7 @@@ msgid "File %s/%s overwrites the one i msgstr "Soubor %s/%s přepisuje ten z balíku %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 --#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 --#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" @@@ -1520,9 -1518,9 +1510,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:748 ++#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 ++#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Čtu seznamy balíků" @@@ -1661,11 -1658,11 +1650,12 @@@ msgid "File not found msgstr "Soubor nebyl nalezen" #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 --#: methods/gzip.cc:142 ++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 ++#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@@ -1793,7 -1790,7 +1783,7 @@@ msgstr "Spojení datového socketu vypr msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" --#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 ++#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@@ -1925,76 -1922,76 +1915,76 @@@ msgstr "Nemohu otevřít rouru pro %s msgid "Read error from %s process" msgstr "Chyba čtení z procesu %s" --#: methods/http.cc:381 ++#: methods/http.cc:345 msgid "Waiting for headers" msgstr "Čekám na hlavičky" --#: methods/http.cc:527 ++#: methods/http.cc:491 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal jsem jednu řádku hlavičky přes %u znaků" --#: methods/http.cc:535 ++#: methods/http.cc:499 msgid "Bad header line" msgstr "Chybná hlavička" --#: methods/http.cc:554 methods/http.cc:561 ++#: methods/http.cc:518 methods/http.cc:525 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlavičku odpovědi" --#: methods/http.cc:590 ++#: methods/http.cc:554 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlavičku Content-Length" --#: methods/http.cc:605 ++#: methods/http.cc:569 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlavičku Content-Range" --#: methods/http.cc:607 ++#: methods/http.cc:571 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" --#: methods/http.cc:631 ++#: methods/http.cc:595 msgid "Unknown date format" msgstr "Neznámý formát data" --#: methods/http.cc:778 ++#: methods/http.cc:742 msgid "Select failed" msgstr "Výběr selhal" --#: methods/http.cc:783 ++#: methods/http.cc:747 msgid "Connection timed out" msgstr "Čas spojení vyprÅ¡el" --#: methods/http.cc:806 ++#: methods/http.cc:770 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" --#: methods/http.cc:837 ++#: methods/http.cc:798 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" --#: methods/http.cc:865 ++#: methods/http.cc:823 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" --#: methods/http.cc:879 ++#: methods/http.cc:837 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" --#: methods/http.cc:881 ++#: methods/http.cc:839 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" --#: methods/http.cc:1112 ++#: methods/http.cc:1070 msgid "Bad header data" msgstr "Å patné datové záhlaví" --#: methods/http.cc:1129 ++#: methods/http.cc:1087 msgid "Connection failed" msgstr "Spojení selhalo" --#: methods/http.cc:1220 ++#: methods/http.cc:1178 msgid "Internal error" msgstr "Vnitřní chyba" @@@ -2007,7 -2004,7 +1997,7 @@@ msgstr "Nemohu provést mmap prázdnéh msgid "Couldn't make mmap of %lu bytes" msgstr "NeÅ¡lo mmapovat %lu bajtů" --#: apt-pkg/contrib/strutl.cc:938 ++#: apt-pkg/contrib/strutl.cc:984 #, c-format msgid "Selection %s not found" msgstr "Výběr %s nenalezen" @@@ -2129,7 -2126,7 +2119,7 @@@ msgstr "Neplatná operace %s msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" --#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 ++#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nemohu přejít do %s" @@@ -2205,72 -2202,72 +2195,72 @@@ msgstr "Problém při odstraňování s msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" --#: apt-pkg/pkgcache.cc:126 ++#: apt-pkg/pkgcache.cc:135 msgid "Empty package cache" msgstr "Cache balíků je prázdná" --#: apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:141 msgid "The package cache file is corrupted" msgstr "Cache soubor balíků je poÅ¡kozen" --#: apt-pkg/pkgcache.cc:137 ++#: apt-pkg/pkgcache.cc:146 msgid "The package cache file is an incompatible version" msgstr "Cache soubor balíků je v nekompatibilní verzi" --#: apt-pkg/pkgcache.cc:142 ++#: apt-pkg/pkgcache.cc:151 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tento APT nepodporuje systém pro správu verzí '%s'" --#: apt-pkg/pkgcache.cc:147 ++#: apt-pkg/pkgcache.cc:156 msgid "The package cache was built for a different architecture" msgstr "Cache balíků byla vytvořena pro jinou architekturu" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Depends" msgstr "Závisí na" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "PreDepends" msgstr "Předzávisí na" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Suggests" msgstr "Navrhuje" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Recommends" msgstr "Doporučuje" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Conflicts" msgstr "Koliduje s" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Replaces" msgstr "Nahrazuje" --#: apt-pkg/pkgcache.cc:220 ++#: apt-pkg/pkgcache.cc:229 msgid "Obsoletes" msgstr "Zastarává" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "important" msgstr "důležitý" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "required" msgstr "vyžadovaný" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "standard" msgstr "standardní" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "optional" msgstr "volitelný" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "extra" msgstr "extra" @@@ -2296,52 -2293,52 +2286,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:94 ++#: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" --#: apt-pkg/sourcelist.cc:96 ++#: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" --#: apt-pkg/sourcelist.cc:99 ++#: apt-pkg/sourcelist.cc:92 #, 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:105 ++#: apt-pkg/sourcelist.cc:98 #, 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:112 ++#: apt-pkg/sourcelist.cc:105 #, 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:203 ++#: apt-pkg/sourcelist.cc:156 #, c-format msgid "Opening %s" msgstr "Otevírám %s" --#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450 #, 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:240 ++#: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" --#: apt-pkg/sourcelist.cc:244 - #, fuzzy, c-format ++#: apt-pkg/sourcelist.cc:191 + #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý" --#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 ++#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" @@@ -2390,10 -2387,10 +2380,10 @@@ msgstr "Adresář seznamů %spartial ch msgid "Archive directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." --#: apt-pkg/acquire.cc:821 ++#: apt-pkg/acquire.cc:817 #, c-format msgid "Downloading file %li of %li (%s remaining)" - msgstr "" + msgstr "Stahuji soubor %li z %li (%s zbývá)" #: apt-pkg/acquire-worker.cc:113 #, c-format @@@ -2406,19 -2403,16 +2396,16 @@@ msgid "Method %s did not start correctl msgstr "Metoda %s nebyla spuÅ¡těna správně" #: apt-pkg/acquire-worker.cc:377 - #, fuzzy, c-format + #, 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" + msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter." --#: apt-pkg/init.cc:120 ++#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' není podporován" --#: apt-pkg/init.cc:136 ++#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" @@@ -2462,88 -2456,88 +2449,104 @@@ msgstr "Cache má nekompatibilní systà 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:132 #, 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:155 ++#, fuzzy, c-format ++msgid "Error occured while processing %s (NewFileDesc1)" ++msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" ++ ++#: apt-pkg/pkgcachegen.cc:180 #, 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:184 #, 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:215 #, 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:219 #, 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:223 #, 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:247 ++#, fuzzy, c-format ++msgid "Error occured while processing %s (NewFileDesc2)" ++msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" ++ ++#: apt-pkg/pkgcachegen.cc:253 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:256 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:259 ++#, fuzzy ++msgid "Wow, you exceeded the number of descriptions this APT is capable of." ++msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat." ++ ++#: apt-pkg/pkgcachegen.cc:262 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:290 #, 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:303 #, 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:309 #, 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:679 #, 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:763 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" --#: apt-pkg/acquire-item.cc:126 ++#: apt-pkg/acquire-item.cc:129 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." --#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 ++#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635 ++#: apt-pkg/acquire-item.cc:1336 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" --#: apt-pkg/acquire-item.cc:719 ++#: apt-pkg/acquire-item.cc:1150 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2552,7 -2546,7 +2555,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:778 ++#: apt-pkg/acquire-item.cc:1203 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2561,14 -2555,14 +2564,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:814 ++#: apt-pkg/acquire-item.cc:1239 #, 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:901 ++#: apt-pkg/acquire-item.cc:1326 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@@ -2577,7 -2571,7 +2580,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobce %s neobsahuje otisk klíče" --#: apt-pkg/cdrom.cc:507 ++#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2586,47 -2580,47 +2589,49 @@@ msgstr " "Používám přípojný bod %s\n" "Připojuji CD-ROM\n" --#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 ++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Rozpoznávám... " --#: apt-pkg/cdrom.cc:541 ++#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Uložený název: %s \n" --#: apt-pkg/cdrom.cc:561 ++#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" --#: apt-pkg/cdrom.cc:579 ++#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Odpojuji CD-ROM\n" --#: apt-pkg/cdrom.cc:583 ++#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Čekám na disk...\n" #. Mount the new CDROM --#: apt-pkg/cdrom.cc:591 ++#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM...\n" --#: apt-pkg/cdrom.cc:609 ++#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Hledám na disku indexové soubory...\n" --#: apt-pkg/cdrom.cc:647 --#, c-format --msgid "Found %i package indexes, %i source indexes and %i signatures\n" ++#: apt-pkg/cdrom.cc:673 ++#, fuzzy, c-format ++msgid "" ++"Found %i package indexes, %i source indexes, %i translation indexes and %i " ++"signatures\n" msgstr "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i) a podpisy (%i)\n" --#: apt-pkg/cdrom.cc:710 ++#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Nejedná se o platné jméno, zkuste to znovu.\n" --#: apt-pkg/cdrom.cc:726 ++#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@@ -2635,38 -2629,38 +2640,38 @@@ msgstr " "Tento disk se nazývá: \n" "'%s'\n" --#: apt-pkg/cdrom.cc:730 ++#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků..." --#: apt-pkg/cdrom.cc:754 ++#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" --#: apt-pkg/cdrom.cc:763 ++#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" --#: apt-pkg/cdrom.cc:803 ++#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Odpojuji CD-ROM..." --#: apt-pkg/indexcopy.cc:261 ++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsal jsem %i záznamů.\n" --#: apt-pkg/indexcopy.cc:263 ++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapsal jsem %i záznamů s chybějícími soubory (%i).\n" --#: apt-pkg/indexcopy.cc:266 ++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapsal jsem %i záznamů s nesouhlasícími soubory (%i).\n" --#: apt-pkg/indexcopy.cc:269 ++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@@ -2720,8 -2714,8 +2725,26 @@@ msgstr "Připravuji odstranění %s vč #: apt-pkg/deb/dpkgpm.cc:379 #, c-format msgid "Removed with config %s" - msgstr "" + msgstr "Odstraněn %s včetně konfiguračního souboru" + ++#: methods/rred.cc:219 ++#, fuzzy ++msgid "Could not patch file" ++msgstr "Nemohu otevřít soubor %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" ++ ++#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" ++#~ msgstr "Zadejte prosím název tohoto média, např. 'Debian 2.1r1 Disk 1'" ++ ++#~ msgid "Please insert a Disc in the drive and press enter" ++#~ msgstr "Vložte prosím médium do mechaniky a stiskněte enter" ++ ++#~ msgid "Repeat this process for the rest of the CDs in your set." ++#~ msgstr "Tento proces opakujte pro vÅ¡echna zbývající média." ++ ++#, fuzzy ++#~ msgid "Skiping already downloaded file '%s'\n" ++#~ msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" diff --cc po/da.po index b43f81e8f,a674910d3..42669e394 --- a/po/da.po +++ b/po/da.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-11-30 08:37+0100\n" -"POT-Creation-Date: 2006-01-04 18:51+0100\n" ++"POT-Creation-Date: 2005-10-17 19:31+0200\n" "PO-Revision-Date: 2005-11-07 15:28+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@@ -18,147 -18,147 +18,157 @@@ "X-Generator: KBabel 1.10.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" --#: cmdline/apt-cache.cc:135 ++#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s version %s har en uopfyldt afhængighed:\n" --#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 --#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 --#: cmdline/apt-cache.cc:1508 ++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 ++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 ++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" --#: cmdline/apt-cache.cc:232 ++#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Totale pakkenavne : " --#: cmdline/apt-cache.cc:272 ++#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normale pakker: " --#: cmdline/apt-cache.cc:273 ++#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Rene virtuelle pakker: " --#: cmdline/apt-cache.cc:274 ++#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Enkelte virtuelle pakker: " --#: cmdline/apt-cache.cc:275 ++#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Blandede virtuelle pakker: " --#: cmdline/apt-cache.cc:276 ++#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Manglende: " --#: cmdline/apt-cache.cc:278 ++#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Totale forskellige versioner: " --#: cmdline/apt-cache.cc:280 ++#: cmdline/apt-cache.cc:293 ++#, fuzzy ++msgid "Total Distinct Descriptions: " ++msgstr "Totale forskellige versioner: " ++ ++#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Totale afhængigheder: " --#: cmdline/apt-cache.cc:283 ++#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Totale version/fil-relationer: " --#: cmdline/apt-cache.cc:285 ++#: cmdline/apt-cache.cc:300 ++#, fuzzy ++msgid "Total Desc/File relations: " ++msgstr "Totale version/fil-relationer: " ++ ++#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Totale 'tilbyder'-markeringer: " --#: cmdline/apt-cache.cc:297 ++#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Totalle søgemønsterstrenge: " --#: cmdline/apt-cache.cc:311 ++#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total afhængighedsversions-plads: " --#: cmdline/apt-cache.cc:316 ++#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Total 'Slack'-plads: " --#: cmdline/apt-cache.cc:324 ++#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total plads, der kan gøres rede for: " --#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 ++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefilen %s er ude af trit." --#: cmdline/apt-cache.cc:1231 ++#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Du skal angive nøjagtig ét mønster" --#: cmdline/apt-cache.cc:1385 ++#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Fandt ingen pakker" # Overskriften til apt-cache policy, # forkorter "Package" væk. CH --#: cmdline/apt-cache.cc:1462 ++#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakkefiler:" --#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 ++#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil" --#: cmdline/apt-cache.cc:1470 ++#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins --#: cmdline/apt-cache.cc:1482 ++#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "'Pinned' pakker:" --#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 ++#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ikke fundet)" #. Installed version --#: cmdline/apt-cache.cc:1515 ++#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installeret: " --#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 ++#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ingen)" #. Candidate Version --#: cmdline/apt-cache.cc:1522 ++#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat: " --#: cmdline/apt-cache.cc:1532 ++#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pakke-pin: " #. Show the priority tables --#: cmdline/apt-cache.cc:1541 ++#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versionstabel:" --#: cmdline/apt-cache.cc:1556 ++#: cmdline/apt-cache.cc:1618 #, c-format 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-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2325 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" --#: cmdline/apt-cache.cc:1658 ++#: cmdline/apt-cache.cc:1720 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -232,18 -232,18 +242,6 @@@ msgstr " " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n" --#: cmdline/apt-cdrom.cc:78 --msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" --msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'" -- --#: cmdline/apt-cdrom.cc:93 --msgid "Please insert a Disc in the drive and press enter" --msgstr "Indsæt en disk i drevet og tryk retur" -- --#: cmdline/apt-cdrom.cc:117 --msgid "Repeat this process for the rest of the CDs in your set." --msgstr "Gentag processen for resten af cd'erne i dit sæt." -- #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Parametre ikke angivet i par" @@@ -305,7 -305,7 +303,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:815 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@@ -526,12 -526,12 +524,12 @@@ msgstr "Kunne ikke finde %s msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" --#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 ++#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" --#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 ++#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" @@@ -635,7 -635,7 +633,7 @@@ msgstr "Kunne ikke omdøbe %s til %s msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 ++#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@@ -796,11 -796,11 +794,11 @@@ msgstr "Pakker skal afinstalleres, men msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldført" - #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 ++#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" - #: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 ++#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke læses." @@@ -829,7 -829,7 +827,7 @@@ msgstr "Efter udpakning vil %sB yderlig msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" - #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 ++#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@@ -866,7 -866,7 +864,7 @@@ msgstr "Afbryder. msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " - #: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 ++#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@@ -875,7 -875,7 +873,7 @@@ msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" - #: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 ++#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@@ -974,15 -974,15 +972,15 @@@ msgstr "Versionen '%s' for '%s' blev ik msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" - #: cmdline/apt-get.cc:1311 -#: cmdline/apt-get.cc:1313 ++#: cmdline/apt-get.cc:1284 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" - #: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 ++#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 msgid "Unable to lock the list directory" msgstr "Kunne ikke låse listemappen" - #: cmdline/apt-get.cc:1382 -#: cmdline/apt-get.cc:1384 ++#: cmdline/apt-get.cc:1355 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -990,25 -990,25 +988,25 @@@ msgstr " "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " "bruges i stedet." - #: cmdline/apt-get.cc:1401 -#: cmdline/apt-get.cc:1403 ++#: cmdline/apt-get.cc:1374 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" - #: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 ++#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" - #: cmdline/apt-get.cc:1523 -#: cmdline/apt-get.cc:1525 ++#: cmdline/apt-get.cc:1496 #, 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:1553 -#: cmdline/apt-get.cc:1555 ++#: cmdline/apt-get.cc:1526 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:1556 -#: cmdline/apt-get.cc:1558 ++#: cmdline/apt-get.cc:1529 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1016,7 -1016,7 +1014,7 @@@ msgstr " "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." - #: cmdline/apt-get.cc:1568 -#: cmdline/apt-get.cc:1570 ++#: cmdline/apt-get.cc:1541 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" @@@ -1027,7 -1027,7 +1025,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:1576 -#: cmdline/apt-get.cc:1578 ++#: cmdline/apt-get.cc:1549 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" @@@ -1036,114 -1036,119 +1034,114 @@@ 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:1581 -#: cmdline/apt-get.cc:1583 ++#: cmdline/apt-get.cc:1554 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:1584 -#: cmdline/apt-get.cc:1586 ++#: cmdline/apt-get.cc:1557 msgid "Broken packages" msgstr "Ødelagte pakker" - #: cmdline/apt-get.cc:1610 -#: cmdline/apt-get.cc:1612 ++#: cmdline/apt-get.cc:1583 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1683 ++#: cmdline/apt-get.cc:1654 msgid "Suggested packages:" msgstr "Foreslåede pakker:" - #: cmdline/apt-get.cc:1682 -#: cmdline/apt-get.cc:1684 ++#: cmdline/apt-get.cc:1655 msgid "Recommended packages:" msgstr "Anbefalede pakker:" - #: cmdline/apt-get.cc:1702 -#: cmdline/apt-get.cc:1704 ++#: cmdline/apt-get.cc:1675 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " - #: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislykkedes" - #: cmdline/apt-get.cc:1710 -#: cmdline/apt-get.cc:1712 ++#: cmdline/apt-get.cc:1683 msgid "Done" msgstr "Færdig" - #: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 ++#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" - #: cmdline/apt-get.cc:1883 -#: cmdline/apt-get.cc:1885 ++#: cmdline/apt-get.cc:1856 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:1910 cmdline/apt-get.cc:2118 -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 ++#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" - #: cmdline/apt-get.cc:1957 -#: cmdline/apt-get.cc:1959 -#, fuzzy, c-format -msgid "Skiping already downloaded file '%s'\n" -msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" - -#: cmdline/apt-get.cc:1983 ++#: cmdline/apt-get.cc:1930 #, 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:1962 -#: cmdline/apt-get.cc:1988 ++#: cmdline/apt-get.cc:1935 #, 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:1965 -#: cmdline/apt-get.cc:1991 ++#: cmdline/apt-get.cc:1938 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" - #: cmdline/apt-get.cc:1971 -#: cmdline/apt-get.cc:1997 ++#: cmdline/apt-get.cc:1944 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" - #: cmdline/apt-get.cc:2002 -#: cmdline/apt-get.cc:2028 ++#: cmdline/apt-get.cc:1975 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2056 ++#: cmdline/apt-get.cc:2003 #, 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:2042 -#: cmdline/apt-get.cc:2068 ++#: cmdline/apt-get.cc:2015 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" - #: cmdline/apt-get.cc:2043 -#: cmdline/apt-get.cc:2069 ++#: cmdline/apt-get.cc:2016 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" - #: cmdline/apt-get.cc:2060 -#: cmdline/apt-get.cc:2086 ++#: cmdline/apt-get.cc:2033 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" - #: cmdline/apt-get.cc:2079 -#: cmdline/apt-get.cc:2105 ++#: cmdline/apt-get.cc:2052 msgid "Child process failed" msgstr "Barneprocessen fejlede" - #: cmdline/apt-get.cc:2095 -#: cmdline/apt-get.cc:2121 ++#: cmdline/apt-get.cc:2068 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:2123 -#: cmdline/apt-get.cc:2149 ++#: cmdline/apt-get.cc:2096 #, 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:2143 -#: cmdline/apt-get.cc:2169 ++#: cmdline/apt-get.cc:2116 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" - #: cmdline/apt-get.cc:2195 -#: cmdline/apt-get.cc:2221 ++#: cmdline/apt-get.cc:2168 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1151,7 -1156,7 +1149,7 @@@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" - #: cmdline/apt-get.cc:2247 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2220 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1160,32 -1165,32 +1158,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:2282 -#: cmdline/apt-get.cc:2308 ++#: cmdline/apt-get.cc:2255 #, 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:2307 -#: cmdline/apt-get.cc:2333 ++#: cmdline/apt-get.cc:2280 #, 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:2321 -#: cmdline/apt-get.cc:2347 ++#: cmdline/apt-get.cc:2294 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." - #: cmdline/apt-get.cc:2325 -#: cmdline/apt-get.cc:2351 ++#: cmdline/apt-get.cc:2298 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" - #: cmdline/apt-get.cc:2357 -#: cmdline/apt-get.cc:2383 ++#: cmdline/apt-get.cc:2330 msgid "Supported modules:" msgstr "Understøttede moduler:" - #: cmdline/apt-get.cc:2398 -#: cmdline/apt-get.cc:2424 ++#: cmdline/apt-get.cc:2371 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1442,7 -1447,7 +1440,7 @@@ msgstr "Dobbelt opsætningsfil %s/%s msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" --#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 ++#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" @@@ -1495,8 -1500,8 +1493,7 @@@ msgid "File %s/%s overwrites the one i msgstr "File %s/%s overskriver filen i pakken %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 --#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 --#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke læse %s" @@@ -1526,9 -1531,9 +1523,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:748 ++#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 ++#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Indlæser pakkelisterne" @@@ -1667,11 -1672,11 +1664,12 @@@ msgid "File not found msgstr "Fil blev ikke fundet" #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 --#: methods/gzip.cc:142 ++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Kunne ikke finde" #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 ++#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@@ -1799,7 -1804,7 +1797,7 @@@ msgstr "Tidsudløb på datasokkel-forbind msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" --#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 ++#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@@ -1932,77 -1937,77 +1930,77 @@@ msgstr "Kunne ikke åbne datarør for %s msgid "Read error from %s process" msgstr "Læsefejl fra %s-process" --#: methods/http.cc:381 ++#: methods/http.cc:345 msgid "Waiting for headers" msgstr "Afventer hoveder" --#: methods/http.cc:527 ++#: methods/http.cc:491 #, c-format msgid "Got a single header line over %u chars" msgstr "Fandt en enkelt linje i hovedet på over %u tegn" --#: methods/http.cc:535 ++#: methods/http.cc:499 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" --#: methods/http.cc:554 methods/http.cc:561 ++#: methods/http.cc:518 methods/http.cc:525 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" --#: methods/http.cc:590 ++#: methods/http.cc:554 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http-serveren sendte et ugyldigt Content-Length-hovede" --#: methods/http.cc:605 ++#: methods/http.cc:569 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http-serveren sendte et ugyldigt Content-Range-hovede" --#: methods/http.cc:607 ++#: methods/http.cc:571 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')" --#: methods/http.cc:631 ++#: methods/http.cc:595 msgid "Unknown date format" msgstr "Ukendt datoformat" --#: methods/http.cc:778 ++#: methods/http.cc:742 msgid "Select failed" msgstr "Valg mislykkedes" --#: methods/http.cc:783 ++#: methods/http.cc:747 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" --#: methods/http.cc:806 ++#: methods/http.cc:770 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" --#: methods/http.cc:837 ++#: methods/http.cc:798 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" --#: methods/http.cc:865 ++#: methods/http.cc:823 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" --#: methods/http.cc:879 ++#: methods/http.cc:837 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" --#: methods/http.cc:881 ++#: methods/http.cc:839 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" --#: methods/http.cc:1112 ++#: methods/http.cc:1070 msgid "Bad header data" msgstr "Ugyldige hoved-data" --#: methods/http.cc:1129 ++#: methods/http.cc:1087 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" --#: methods/http.cc:1220 ++#: methods/http.cc:1178 msgid "Internal error" msgstr "Intern fejl" @@@ -2015,7 -2020,7 +2013,7 @@@ msgstr "Kan ikke udføre mmap for en to msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke udføre mmap for %lu byte" --#: apt-pkg/contrib/strutl.cc:938 ++#: apt-pkg/contrib/strutl.cc:984 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" @@@ -2136,7 -2141,7 +2134,7 @@@ msgstr "Ugyldig handling %s msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" --#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 ++#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunne ikke skifte til %s" @@@ -2212,72 -2217,72 +2210,72 @@@ msgstr "Fejl ved frigivelse af filen msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" --#: apt-pkg/pkgcache.cc:126 ++#: apt-pkg/pkgcache.cc:135 msgid "Empty package cache" msgstr "Tomt pakke-mellemlager" --#: apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:141 msgid "The package cache file is corrupted" msgstr "Pakke-mellemlagerets fil er ødelagt" --#: apt-pkg/pkgcache.cc:137 ++#: apt-pkg/pkgcache.cc:146 msgid "The package cache file is an incompatible version" msgstr "Pakke-mellemlagerets fil er af en inkompatibel version" --#: apt-pkg/pkgcache.cc:142 ++#: apt-pkg/pkgcache.cc:151 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT understøtter ikke versionssystemet '%s'" --#: apt-pkg/pkgcache.cc:147 ++#: apt-pkg/pkgcache.cc:156 msgid "The package cache was built for a different architecture" msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Depends" msgstr "Afhængigheder" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "PreDepends" msgstr "Præ-afhængigheder" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Suggests" msgstr "Foreslåede" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Recommends" msgstr "Anbefalede" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Conflicts" msgstr "Konflikter" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Replaces" msgstr "Erstatter" --#: apt-pkg/pkgcache.cc:220 ++#: apt-pkg/pkgcache.cc:229 msgid "Obsoletes" msgstr "Overflødiggør" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "important" msgstr "vigtig" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "required" msgstr "krævet" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "standard" msgstr "standard" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "optional" msgstr "frivillig" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "extra" msgstr "ekstra" @@@ -2303,52 -2308,52 +2301,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:94 ++#: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" --#: apt-pkg/sourcelist.cc:96 ++#: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" --#: apt-pkg/sourcelist.cc:99 ++#: apt-pkg/sourcelist.cc:92 #, 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:105 ++#: apt-pkg/sourcelist.cc:98 #, 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:112 ++#: apt-pkg/sourcelist.cc:105 #, 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:203 ++#: apt-pkg/sourcelist.cc:156 #, c-format msgid "Opening %s" msgstr "Åbner %s" --#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." --#: apt-pkg/sourcelist.cc:240 ++#: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" --#: apt-pkg/sourcelist.cc:244 ++#: apt-pkg/sourcelist.cc:191 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" --#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 ++#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" @@@ -2400,7 -2405,7 +2398,7 @@@ msgstr "Listemappen %spartial mangler. msgid "Archive directory %spartial is missing." msgstr "Arkivmappen %spartial mangler." --#: apt-pkg/acquire.cc:821 ++#: apt-pkg/acquire.cc:817 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "Henter fil %li ud af %li (%s tilbage)" @@@ -2420,12 -2425,12 +2418,12 @@@ msgstr "Metoden %s startede ikke korrek 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." --#: apt-pkg/init.cc:120 ++#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understøttes ikke" --#: apt-pkg/init.cc:136 ++#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@@ -2468,88 -2473,88 +2466,104 @@@ msgstr "Mellemlageret benytter en inkom msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:132 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:155 ++#, fuzzy, c-format ++msgid "Error occured while processing %s (NewFileDesc1)" ++msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" ++ ++#: apt-pkg/pkgcachegen.cc:180 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:215 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:219 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:223 #, 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:247 ++#, fuzzy, c-format ++msgid "Error occured while processing %s (NewFileDesc2)" ++msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" ++ ++#: apt-pkg/pkgcachegen.cc:253 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:256 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:259 ++#, fuzzy ++msgid "Wow, you exceeded the number of descriptions 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:262 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 ++#: apt-pkg/pkgcachegen.cc:290 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:303 #, 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:309 #, 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:679 #, 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:763 msgid "Collecting File Provides" msgstr "Samler filudbud" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" --#: apt-pkg/acquire-item.cc:126 ++#: apt-pkg/acquire-item.cc:129 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." --#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 ++#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635 ++#: apt-pkg/acquire-item.cc:1336 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" --#: apt-pkg/acquire-item.cc:719 ++#: apt-pkg/acquire-item.cc:1150 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2558,7 -2563,7 +2572,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:778 ++#: apt-pkg/acquire-item.cc:1203 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2567,13 -2572,13 +2581,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:814 ++#: apt-pkg/acquire-item.cc:1239 #, 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:901 ++#: apt-pkg/acquire-item.cc:1326 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@@ -2582,7 -2587,7 +2596,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Leverandørblok %s inderholder intet fingeraftryk" --#: apt-pkg/cdrom.cc:507 ++#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2591,47 -2596,47 +2605,49 @@@ msgstr " "Bruger cdrom-monteringspunktet %s\n" "Monterer cdrom\n" --#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 ++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identificerer.. " --#: apt-pkg/cdrom.cc:541 ++#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Gemt mærkat: %s \n" --#: apt-pkg/cdrom.cc:561 ++#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruger cdrom-monteringspunktet %s\n" --#: apt-pkg/cdrom.cc:579 ++#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Afmonterer cdrom\n" --#: apt-pkg/cdrom.cc:583 ++#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Venter på disken...\n" #. Mount the new CDROM --#: apt-pkg/cdrom.cc:591 ++#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Monterer cdrom...\n" --#: apt-pkg/cdrom.cc:609 ++#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Skanner disken for indeksfiler..\n" --#: apt-pkg/cdrom.cc:647 --#, c-format --msgid "Found %i package indexes, %i source indexes and %i signatures\n" ++#: apt-pkg/cdrom.cc:673 ++#, fuzzy, c-format ++msgid "" ++"Found %i package indexes, %i source indexes, %i translation indexes and %i " ++"signatures\n" msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n" --#: apt-pkg/cdrom.cc:710 ++#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldigt navn, prøv igen.\n" --#: apt-pkg/cdrom.cc:726 ++#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@@ -2640,38 -2645,38 +2656,38 @@@ msgstr " "Denne disk hedder: \n" " %s \n" --#: apt-pkg/cdrom.cc:730 ++#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne..." --#: apt-pkg/cdrom.cc:754 ++#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" --#: apt-pkg/cdrom.cc:763 ++#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" --#: apt-pkg/cdrom.cc:803 ++#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Afmonterer cdrom..." --#: apt-pkg/indexcopy.cc:261 ++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" --#: apt-pkg/indexcopy.cc:263 ++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" --#: apt-pkg/indexcopy.cc:266 ++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i ikke-trufne filer\n" --#: apt-pkg/indexcopy.cc:269 ++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format 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" @@@ -2726,10 -2731,10 +2742,28 @@@ msgstr "Gør klar til at fjerne %s inklu msgid "Removed with config %s" msgstr "Fjernede %s inklusive opsætning" ++#: methods/rred.cc:219 ++#, fuzzy ++msgid "Could not patch file" ++msgstr "Kunne ikke åbne filen %s" ++ #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" ++#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" ++#~ msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'" ++ ++#~ msgid "Please insert a Disc in the drive and press enter" ++#~ msgstr "Indsæt en disk i drevet og tryk retur" ++ ++#~ msgid "Repeat this process for the rest of the CDs in your set." ++#~ msgstr "Gentag processen for resten af cd'erne i dit sæt." ++ ++#, fuzzy ++#~ msgid "Skiping already downloaded file '%s'\n" ++#~ msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" ++ #~ 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 784328894,f0e9530e0..4d612040a --- 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-11-30 08:37+0100\n" -"POT-Creation-Date: 2006-01-04 18:51+0100\n" ++"POT-Creation-Date: 2005-10-17 19:31+0200\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@@ -15,145 -15,145 +15,155 @@@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" --#: cmdline/apt-cache.cc:135 ++#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s Version %s hat eine nichterfüllte Abhängigkeit:\n" --#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 --#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 --#: cmdline/apt-cache.cc:1508 ++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 ++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 ++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Kann Paket %s nicht finden" --#: cmdline/apt-cache.cc:232 ++#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Gesamtzahl an Paketnamen: " --#: cmdline/apt-cache.cc:272 ++#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " davon gewöhnliche Pakete: " --#: cmdline/apt-cache.cc:273 ++#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " davon rein virtuelle Pakete: " --#: cmdline/apt-cache.cc:274 ++#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " davon einzelne virtuelle Pakete: " --#: cmdline/apt-cache.cc:275 ++#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " davon gemischte virtuelle Pakete: " --#: cmdline/apt-cache.cc:276 ++#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " davon fehlend: " --#: cmdline/apt-cache.cc:278 ++#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Gesamtzahl an unterschiedlichen Versionen: " --#: cmdline/apt-cache.cc:280 ++#: cmdline/apt-cache.cc:293 ++#, fuzzy ++msgid "Total Distinct Descriptions: " ++msgstr "Gesamtzahl an unterschiedlichen Versionen: " ++ ++#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Gesamtzahl an Abhängigkeiten: " --#: cmdline/apt-cache.cc:283 ++#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Gesamtzahl an Version/Datei-Beziehungen: " --#: cmdline/apt-cache.cc:285 ++#: cmdline/apt-cache.cc:300 ++#, fuzzy ++msgid "Total Desc/File relations: " ++msgstr "Gesamtzahl an Version/Datei-Beziehungen: " ++ ++#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Gesamtzahl an Bereitstellungen: " --#: cmdline/apt-cache.cc:297 ++#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Gesamtzahl an Mustern: " --#: cmdline/apt-cache.cc:311 ++#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Gesamtmenge an Abhängigkeits/Versionsspeicher: " --#: cmdline/apt-cache.cc:316 ++#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Gesamtmenge an Slack: " --#: cmdline/apt-cache.cc:324 ++#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Gesamtmenge an Speicher: " --#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 ++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Paketdatei %s ist nicht synchronisiert." --#: cmdline/apt-cache.cc:1231 ++#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Sie müssen genau ein Muster angeben" --#: cmdline/apt-cache.cc:1385 ++#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Keine Pakete gefunden" --#: cmdline/apt-cache.cc:1462 ++#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Paketdateien:" --#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 ++#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache ist nicht sychron, kann eine Paketdatei nicht querverweisen" --#: cmdline/apt-cache.cc:1470 ++#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins --#: cmdline/apt-cache.cc:1482 ++#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Festgehaltene Pakete (»Pin«):" --#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 ++#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nicht gefunden)" #. Installed version --#: cmdline/apt-cache.cc:1515 ++#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installiert:" --#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 ++#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(keine)" #. Candidate Version --#: cmdline/apt-cache.cc:1522 ++#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Mögliche Pakete:" --#: cmdline/apt-cache.cc:1532 ++#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Paketstecknadel: " #. Show the priority tables --#: cmdline/apt-cache.cc:1541 ++#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versions-Tabelle:" --#: cmdline/apt-cache.cc:1556 ++#: cmdline/apt-cache.cc:1618 #, c-format 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-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2325 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" --#: cmdline/apt-cache.cc:1658 ++#: cmdline/apt-cache.cc:1720 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -228,21 -228,21 +238,6 @@@ msgstr " "tmp\n" "Siehe auch apt-cache(8) und apt.conf(5) für weitere Informationen.\n" --#: cmdline/apt-cdrom.cc:78 --msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" --msgstr "" --"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 " --"Disk 1«" -- --#: cmdline/apt-cdrom.cc:93 --msgid "Please insert a Disc in the drive and press enter" --msgstr "" --"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" -- --#: cmdline/apt-cdrom.cc:117 --msgid "Repeat this process for the rest of the CDs in your set." --msgstr "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe." -- #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumente nicht paarweise" @@@ -308,7 -308,7 +303,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:815 #, c-format msgid "Unable to write to %s" msgstr "Kann nicht nach %s schreiben" @@@ -537,12 -537,12 +532,12 @@@ msgstr "Kann auf %s nicht zugreifen. msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" --#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 ++#: ftparchive/writer.cc:394 ftparchive/writer.cc:602 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" --#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 ++#: ftparchive/writer.cc:437 ftparchive/writer.cc:688 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Maintainer ist %s und nicht %s\n" @@@ -646,7 -646,7 +641,7 @@@ msgstr "Konnte %s nicht in %s umbenenne msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 ++#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@@ -810,11 -810,11 +805,11 @@@ msgstr "Pakete müssen entfernt werden msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" - #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 ++#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." - #: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 ++#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@@ -845,7 -845,7 +840,7 @@@ msgstr "Nach dem Auspacken werden %sB P msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" - #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 ++#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" @@@ -882,7 -882,7 +877,7 @@@ msgstr "Abbruch. msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " - #: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 ++#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" @@@ -891,7 -891,7 +886,7 @@@ msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" - #: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 ++#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" @@@ -991,15 -991,15 +986,15 @@@ msgstr "Version »%s« für »%s« konn msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" - #: cmdline/apt-get.cc:1311 -#: cmdline/apt-get.cc:1313 ++#: cmdline/apt-get.cc:1284 msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" - #: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 ++#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" - #: cmdline/apt-get.cc:1382 -#: cmdline/apt-get.cc:1384 ++#: cmdline/apt-get.cc:1355 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -1007,27 -1007,27 +1002,27 @@@ msgstr " "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." - #: cmdline/apt-get.cc:1401 -#: cmdline/apt-get.cc:1403 ++#: cmdline/apt-get.cc:1374 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" - #: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 ++#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" - #: cmdline/apt-get.cc:1523 -#: cmdline/apt-get.cc:1525 ++#: cmdline/apt-get.cc:1496 #, 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:1553 -#: cmdline/apt-get.cc:1555 ++#: cmdline/apt-get.cc:1526 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:1556 -#: cmdline/apt-get.cc:1558 ++#: cmdline/apt-get.cc:1529 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1035,7 -1035,7 +1030,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:1568 -#: cmdline/apt-get.cc:1570 ++#: cmdline/apt-get.cc:1541 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" @@@ -1047,7 -1047,7 +1042,7 @@@ msgstr " "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." - #: cmdline/apt-get.cc:1576 -#: cmdline/apt-get.cc:1578 ++#: cmdline/apt-get.cc:1549 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" @@@ -1058,119 -1058,124 +1053,119 @@@ msgstr " "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1583 ++#: cmdline/apt-get.cc:1554 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:1584 -#: cmdline/apt-get.cc:1586 ++#: cmdline/apt-get.cc:1557 msgid "Broken packages" msgstr "Kaputte Pakete" - #: cmdline/apt-get.cc:1610 -#: cmdline/apt-get.cc:1612 ++#: cmdline/apt-get.cc:1583 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1683 ++#: cmdline/apt-get.cc:1654 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" - #: cmdline/apt-get.cc:1682 -#: cmdline/apt-get.cc:1684 ++#: cmdline/apt-get.cc:1655 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" - #: cmdline/apt-get.cc:1702 -#: cmdline/apt-get.cc:1704 ++#: cmdline/apt-get.cc:1675 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." - #: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fehlgeschlagen" - #: cmdline/apt-get.cc:1710 -#: cmdline/apt-get.cc:1712 ++#: cmdline/apt-get.cc:1683 msgid "Done" msgstr "Fertig" - #: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 ++#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" - #: cmdline/apt-get.cc:1883 -#: cmdline/apt-get.cc:1885 ++#: cmdline/apt-get.cc:1856 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:1910 cmdline/apt-get.cc:2118 -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 ++#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" - #: cmdline/apt-get.cc:1957 -#: cmdline/apt-get.cc:1959 -#, fuzzy, c-format -msgid "Skiping already downloaded file '%s'\n" -msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" - -#: cmdline/apt-get.cc:1983 ++#: cmdline/apt-get.cc:1930 #, 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:1962 -#: cmdline/apt-get.cc:1988 ++#: cmdline/apt-get.cc:1935 #, 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:1965 -#: cmdline/apt-get.cc:1991 ++#: cmdline/apt-get.cc:1938 #, 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:1971 -#: cmdline/apt-get.cc:1997 ++#: cmdline/apt-get.cc:1944 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" - #: cmdline/apt-get.cc:2002 -#: cmdline/apt-get.cc:2028 ++#: cmdline/apt-get.cc:1975 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2056 ++#: cmdline/apt-get.cc:2003 #, 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:2042 -#: cmdline/apt-get.cc:2068 ++#: cmdline/apt-get.cc:2015 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" - #: cmdline/apt-get.cc:2043 -#: cmdline/apt-get.cc:2069 ++#: cmdline/apt-get.cc:2016 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2060 -#: cmdline/apt-get.cc:2086 ++#: cmdline/apt-get.cc:2033 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" - #: cmdline/apt-get.cc:2079 -#: cmdline/apt-get.cc:2105 ++#: cmdline/apt-get.cc:2052 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" - #: cmdline/apt-get.cc:2095 -#: cmdline/apt-get.cc:2121 ++#: cmdline/apt-get.cc:2068 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:2123 -#: cmdline/apt-get.cc:2149 ++#: cmdline/apt-get.cc:2096 #, 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:2143 -#: cmdline/apt-get.cc:2169 ++#: cmdline/apt-get.cc:2116 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" - #: cmdline/apt-get.cc:2195 -#: cmdline/apt-get.cc:2221 ++#: cmdline/apt-get.cc:2168 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1179,7 -1184,7 +1174,7 @@@ msgstr " "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." - #: cmdline/apt-get.cc:2247 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2220 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1188,32 -1193,32 +1183,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:2282 -#: cmdline/apt-get.cc:2308 ++#: cmdline/apt-get.cc:2255 #, 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:2307 -#: cmdline/apt-get.cc:2333 ++#: cmdline/apt-get.cc:2280 #, 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:2321 -#: cmdline/apt-get.cc:2347 ++#: cmdline/apt-get.cc:2294 #, 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:2325 -#: cmdline/apt-get.cc:2351 ++#: cmdline/apt-get.cc:2298 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" - #: cmdline/apt-get.cc:2357 -#: cmdline/apt-get.cc:2383 ++#: cmdline/apt-get.cc:2330 msgid "Supported modules:" msgstr "Unterstützte Module:" - #: cmdline/apt-get.cc:2398 -#: cmdline/apt-get.cc:2424 ++#: cmdline/apt-get.cc:2371 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1474,7 -1479,7 +1469,7 @@@ msgstr "Doppelte Konfigurationsdatei %s msgid "Failed to write file %s" msgstr "Konnte nicht in Datei %s schreiben" --#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 ++#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" msgstr "Konnte Datei %s nicht schließen" @@@ -1527,8 -1532,8 +1522,7 @@@ msgid "File %s/%s overwrites the one i msgstr "Datei %s/%s überschreibt die Datei in Paket %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 --#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 --#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" @@@ -1559,9 -1564,9 +1553,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:748 ++#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 ++#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" @@@ -1704,11 -1709,11 +1698,12 @@@ msgstr "Datei nicht gefunden # looks like someone hardcoded English grammar #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 --#: methods/gzip.cc:142 ++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Kann nicht zugreifen." #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 ++#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Kann Änderungszeitpunkt nicht setzen" @@@ -1837,7 -1842,7 +1832,7 @@@ msgstr "Datenverbindungsaufbau erlitt Z msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" --#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 ++#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@@ -1970,78 -1975,78 +1965,78 @@@ msgstr "Konnte keine Pipe für %s öffn msgid "Read error from %s process" msgstr "Lesefehler von Prozess %s" --#: methods/http.cc:381 ++#: methods/http.cc:345 msgid "Waiting for headers" msgstr "Warte auf Kopfzeilen (header)" --#: methods/http.cc:527 ++#: methods/http.cc:491 #, c-format msgid "Got a single header line over %u chars" msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" --#: methods/http.cc:535 ++#: methods/http.cc:499 msgid "Bad header line" msgstr "Schlechte Kopfzeile" --#: methods/http.cc:554 methods/http.cc:561 ++#: methods/http.cc:518 methods/http.cc:525 msgid "The HTTP server sent an invalid reply header" msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile" --#: methods/http.cc:590 ++#: methods/http.cc:554 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile" --#: methods/http.cc:605 ++#: methods/http.cc:569 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile" --#: methods/http.cc:607 ++#: methods/http.cc:571 msgid "This HTTP server has broken range support" msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." --#: methods/http.cc:631 ++#: methods/http.cc:595 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" --#: methods/http.cc:778 ++#: methods/http.cc:742 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" --#: methods/http.cc:783 ++#: methods/http.cc:747 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" --#: methods/http.cc:806 ++#: methods/http.cc:770 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" --#: methods/http.cc:837 ++#: methods/http.cc:798 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" --#: methods/http.cc:865 ++#: methods/http.cc:823 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" --#: methods/http.cc:879 ++#: methods/http.cc:837 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" --#: methods/http.cc:881 ++#: methods/http.cc:839 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" --#: methods/http.cc:1112 ++#: methods/http.cc:1070 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" --#: methods/http.cc:1129 ++#: methods/http.cc:1087 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" --#: methods/http.cc:1220 ++#: methods/http.cc:1178 msgid "Internal error" msgstr "Interner Fehler" @@@ -2054,7 -2059,7 +2049,7 @@@ msgstr "Kann eine leere Datei nicht mi msgid "Couldn't make mmap of %lu bytes" msgstr "Konnte kein mmap von %lu Bytes durchführen" --#: apt-pkg/contrib/strutl.cc:938 ++#: apt-pkg/contrib/strutl.cc:984 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" @@@ -2176,7 -2181,7 +2171,7 @@@ msgstr "Ungültige Operation %s. msgid "Unable to stat the mount point %s" msgstr "Kann auf den Einhängepunkt %s nicht zugreifen." --#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 ++#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kann nicht nach %s wechseln" @@@ -2252,72 -2257,72 +2247,72 @@@ msgstr "Beim Unlinking Datei trat ein P msgid "Problem syncing the file" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" --#: apt-pkg/pkgcache.cc:126 ++#: apt-pkg/pkgcache.cc:135 msgid "Empty package cache" msgstr "Leerer Paketcache" --#: apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:141 msgid "The package cache file is corrupted" msgstr "Die Paketcachedatei ist korrumpiert" --#: apt-pkg/pkgcache.cc:137 ++#: apt-pkg/pkgcache.cc:146 msgid "The package cache file is an incompatible version" msgstr "Die Paketcachedatei ist in einer inkompatiblen Version" --#: apt-pkg/pkgcache.cc:142 ++#: apt-pkg/pkgcache.cc:151 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Dieses APT unterstützt das Versionssystem »%s« nicht" --#: apt-pkg/pkgcache.cc:147 ++#: apt-pkg/pkgcache.cc:156 msgid "The package cache was built for a different architecture" msgstr "Der Paketcache wurde für eine andere Architektur aufgebaut" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Depends" msgstr "Hängt ab" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "PreDepends" msgstr "Hängt ab (vorher)" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:227 msgid "Suggests" msgstr "Schlägt vor" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Recommends" msgstr "Empfiehlt" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Conflicts" msgstr "Kollidiert" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:228 msgid "Replaces" msgstr "Ersetzt" --#: apt-pkg/pkgcache.cc:220 ++#: apt-pkg/pkgcache.cc:229 msgid "Obsoletes" msgstr "Veraltet" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "important" msgstr "wichtig" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "required" msgstr "erforderlich" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:240 msgid "standard" msgstr "standard" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "optional" msgstr "optional" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:241 msgid "extra" msgstr "extra" @@@ -2343,52 -2348,52 +2338,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:94 ++#: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" --#: apt-pkg/sourcelist.cc:96 ++#: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" --#: apt-pkg/sourcelist.cc:99 ++#: apt-pkg/sourcelist.cc:92 #, 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:105 ++#: apt-pkg/sourcelist.cc:98 #, 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:112 ++#: apt-pkg/sourcelist.cc:105 #, 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:203 ++#: apt-pkg/sourcelist.cc:156 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" --#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." --#: apt-pkg/sourcelist.cc:240 ++#: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" --#: apt-pkg/sourcelist.cc:244 ++#: apt-pkg/sourcelist.cc:191 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" --#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 ++#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" @@@ -2440,7 -2445,7 +2435,7 @@@ msgstr "Listenverzeichnis %spartial feh msgid "Archive directory %spartial is missing." msgstr "Archivverzeichnis %spartial fehlt." --#: apt-pkg/acquire.cc:821 ++#: apt-pkg/acquire.cc:817 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@@ -2463,12 -2468,12 +2458,12 @@@ msgstr " " »%s«\n" "in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" --#: apt-pkg/init.cc:120 ++#: apt-pkg/init.cc:122 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem »%s« wird nicht unterstützt" --#: apt-pkg/init.cc:136 ++#: apt-pkg/init.cc:138 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" @@@ -2516,92 -2521,92 +2511,110 @@@ msgstr "Dieser Paketcache wurde für ei 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:132 #, 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:155 ++#, fuzzy, c-format ++msgid "Error occured while processing %s (NewFileDesc1)" ++msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" ++ ++#: apt-pkg/pkgcachegen.cc:180 #, 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:184 #, 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:215 #, 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:219 #, 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:223 #, 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:247 ++#, fuzzy, c-format ++msgid "Error occured while processing %s (NewFileDesc2)" ++msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" ++ ++#: apt-pkg/pkgcachegen.cc:253 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:256 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:259 ++#, fuzzy ++msgid "Wow, you exceeded the number of descriptions this APT is capable of." ++msgstr "" ++"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben " ++"kann." ++ ++#: apt-pkg/pkgcachegen.cc:262 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:290 #, 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:303 #, 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:309 #, 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:679 #, 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:763 msgid "Collecting File Provides" msgstr "Sammle Datei-Empfehlungen ein" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Sichern des Quellcaches" --#: apt-pkg/acquire-item.cc:126 ++#: apt-pkg/acquire-item.cc:129 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." --#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 ++#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635 ++#: apt-pkg/acquire-item.cc:1336 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" --#: apt-pkg/acquire-item.cc:719 ++#: apt-pkg/acquire-item.cc:1150 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2610,7 -2615,7 +2623,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:778 ++#: apt-pkg/acquire-item.cc:1203 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2619,14 -2624,14 +2632,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:814 ++#: apt-pkg/acquire-item.cc:1239 #, 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:901 ++#: apt-pkg/acquire-item.cc:1326 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@@ -2635,7 -2640,7 +2648,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck" --#: apt-pkg/cdrom.cc:507 ++#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2644,47 -2649,47 +2657,49 @@@ msgstr " "Benutze CD-ROM-Einhängpunkt %s\n" "Hänge CD ein\n" --#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 ++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identifiziere... " --#: apt-pkg/cdrom.cc:541 ++#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Gespeicherte Kennzeichnung: %s \n" --#: apt-pkg/cdrom.cc:561 ++#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Benutze CD-ROM-Einhängpunkt %s\n" --#: apt-pkg/cdrom.cc:579 ++#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Hänge CD-ROM aus\n" --#: apt-pkg/cdrom.cc:583 ++#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Warte auf CD...\n" #. Mount the new CDROM --#: apt-pkg/cdrom.cc:591 ++#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Hänge CD-ROM ein...\n" --#: apt-pkg/cdrom.cc:609 ++#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Suche auf CD nach Index-Dateien...\n" --#: apt-pkg/cdrom.cc:647 --#, c-format --msgid "Found %i package indexes, %i source indexes and %i signatures\n" ++#: apt-pkg/cdrom.cc:673 ++#, fuzzy, c-format ++msgid "" ++"Found %i package indexes, %i source indexes, %i translation indexes and %i " ++"signatures\n" msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n" --#: apt-pkg/cdrom.cc:710 ++#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" --#: apt-pkg/cdrom.cc:726 ++#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@@ -2693,38 -2698,38 +2708,38 @@@ msgstr " "Diese CD heißt jetzt: \n" "»%s«\n" --#: apt-pkg/cdrom.cc:730 ++#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopiere Paketlisten..." --#: apt-pkg/cdrom.cc:754 ++#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Schreibe neue Quellliste\n" --#: apt-pkg/cdrom.cc:763 ++#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für diese CD sind:\n" --#: apt-pkg/cdrom.cc:803 ++#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Hänge CD-ROM aus..." --#: apt-pkg/indexcopy.cc:261 ++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" --#: apt-pkg/indexcopy.cc:263 ++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" --#: apt-pkg/indexcopy.cc:266 ++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" --#: apt-pkg/indexcopy.cc:269 ++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@@ -2781,10 -2786,10 +2796,32 @@@ msgstr " msgid "Removed with config %s" msgstr "" ++#: methods/rred.cc:219 ++#, fuzzy ++msgid "Could not patch file" ++msgstr "Konnte Datei %s nicht öffnen" ++ #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung zu früh beendet" ++#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" ++#~ msgstr "" ++#~ "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 " ++#~ "Disk 1«" ++ ++#~ msgid "Please insert a Disc in the drive and press enter" ++#~ msgstr "" ++#~ "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" ++ ++#~ msgid "Repeat this process for the rest of the CDs in your set." ++#~ msgstr "" ++#~ "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe." ++ ++#, fuzzy ++#~ msgid "Skiping already downloaded file '%s'\n" ++#~ msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" ++ #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s"