From: Michael Vogt Date: Wed, 17 May 2006 15:58:24 +0000 (+0200) Subject: merged with the debian-sid branch X-Git-Tag: 0.7.21~284^2~34 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/4f5bd4471049f89c4ce52864e62f54aadf1804d4?hp=--cc merged with the debian-sid branch --- 4f5bd4471049f89c4ce52864e62f54aadf1804d4 diff --cc apt-pkg/acquire-item.cc index 52c516090,cc16215f5..966126255 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@@ -134,7 -135,7 +135,6 @@@ void pkgAcquire::Item::Rename(string Fr } /*}}}*/ -- // AcqDiffIndex::AcqDiffIndex - Constructor // --------------------------------------------------------------------- /* Get the DiffIndex file first and see if there are patches availabe diff --cc apt-pkg/tagfile.cc index cae0fa819,fc020436c..2eb269418 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@@ -35,7 -35,7 +35,7 @@@ pkgTagFile::pkgTagFile(FileFd *pFd,unsi Fd(*pFd), Size(Size) { - if (Fd.IsOpen() == false) - if (Fd.IsOpen() == false || Fd.Size() == 0) ++ if (Fd.IsOpen() == false || Fd.Size()) { Buffer = 0; Start = End = Buffer = 0; diff --cc configure.in index 41609c39d,96adad597..a8e565848 --- a/configure.in +++ b/configure.in @@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- - AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3") -AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1exp1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index d2e780235,c4bcf5c1c..2f7e5f872 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,55 +1,63 @@@ - apt (0.6.43.3exp1) experimental; urgency=low ++apt (0.6.44.1exp1) experimental; urgency=low + - * 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) - ++ * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch ++ * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental ++ + -- Michael Vogt Wed, 1 Mar 2006 13:34:15 +0100 + + apt (0.6.44.1) unstable; urgency=low + + * apt-pkg/acquire-item.cc: + - fix reversed logic of the "Acquire::PDiffs" option + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + - po/LINGUAS: added "bg" Closes: #360262 + - po/gl.po: Galician translation update. Closes: #366849 + - po/hu.po: Hungarian translation update. Closes: #365448 + - po/cs.po: Czech translation updated. Closes: #367244 + * apt-pkg/contrib/sha256.cc: + - applied patch to fix unaligned access problem. Closes: #367417 + (thanks to David Mosberger) + + -- Michael Vogt Tue, 16 May 2006 21:51:16 +0200 + + apt (0.6.44) unstable; urgency=low + + * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large + * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 + (thanks to Anthony Towns) + * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations + (thanks to Anthony Towns) + * apt pdiff support from experimental merged + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + * apt-pkg/deb/dpkgpm.cc: + - wording fixes (thanks to Matt Zimmerman) + - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp) + * apt-pkg/tagfile.{cc,h}: + - use MMap to read the entries (thanks to Zephaniah E. Hull for the + patch) Closes: #350025 + * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * bg.po: Added, complete to 512t. Closes: #360262 + * doc/apt-ftparchive.1.xml: + - fix documentation for "SrcPackages" -> "Sources" + (thanks to Bart Martens for the patch, closes: #307756) + * debian/libapt-pkg-doc.doc-base.cache: + - remove broken charackter from description (closes: #361129) + * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: + - i18n fixes (closes: #349298) + * debian/postinst: dont fail on not available + /usr/share/doc/apt/examples/sources.list (closes: #361130) + * methods/ftp.cc: + - unlink empty file in partial if the download failed because + the file is missing on the server (closes: #316337) + * apt-pkg/deb/debversion.cc: + - treats a version string with explicit zero epoch equal + than the same without epoch (Policy 5.6.12, closes: #363358) + Thanks to Lionel Elie Mamane for the patch + + -- Michael Vogt Mon, 8 May 2006 22:28:53 +0200 + apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: diff --cc po/apt-all.pot index 23de34b5c,d2209487a..262200f44 --- 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: 2006-01-20 14:06+0100\n" -"POT-Creation-Date: 2006-05-08 11:02+0200\n" ++"POT-Creation-Date: 2006-05-17 17:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -15,145 -15,145 +15,153 @@@ "Content-Type: text/plain; charset=CHARSET\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 "" --#: 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 #, c-format msgid "Unable to locate package %s" msgstr "" --#: cmdline/apt-cache.cc:232 ++#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "" --#: cmdline/apt-cache.cc:272 ++#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr "" --#: cmdline/apt-cache.cc:273 ++#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr "" --#: cmdline/apt-cache.cc:274 ++#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr "" --#: cmdline/apt-cache.cc:275 ++#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr "" --#: cmdline/apt-cache.cc:276 ++#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr "" --#: cmdline/apt-cache.cc:278 ++#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "" --#: cmdline/apt-cache.cc:280 ++#: cmdline/apt-cache.cc:293 ++msgid "Total Distinct Descriptions: " ++msgstr "" ++ ++#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "" --#: cmdline/apt-cache.cc:283 ++#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "" --#: cmdline/apt-cache.cc:285 ++#: cmdline/apt-cache.cc:300 ++msgid "Total Desc/File relations: " ++msgstr "" ++ ++#: 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:1287 msgid "You must give exactly one pattern" msgstr "" --#: cmdline/apt-cache.cc:1385 ++#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "" --#: cmdline/apt-cache.cc:1462 ++#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "" --#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 ++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" --#: cmdline/apt-cache.cc:1470 ++#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins --#: cmdline/apt-cache.cc:1482 ++#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "" --#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 ++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "" #. Installed version --#: cmdline/apt-cache.cc:1515 ++#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr "" --#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 ++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "" #. Candidate Version --#: cmdline/apt-cache.cc:1522 ++#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr "" --#: cmdline/apt-cache.cc:1532 ++#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr "" #. Show the priority tables --#: cmdline/apt-cache.cc:1541 ++#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr "" --#: cmdline/apt-cache.cc:1556 ++#: cmdline/apt-cache.cc:1612 #, 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:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 ++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-get.cc:2369 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:1659 ++#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -243,7 -243,7 +251,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 "" @@@ -327,115 -327,115 +335,126 @@@ msgstr " msgid "Some files are missing in the package file group `%s'" msgstr "" --#: ftparchive/cachedb.cc:45 ++#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" --#: ftparchive/cachedb.cc:63 ++#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "" --#: ftparchive/cachedb.cc:73 ++#: ftparchive/cachedb.cc:76 ++msgid "" ++"DB format is invalid. If you upgraded from a older version of apt, please " ++"remove and re-create the database." ++msgstr "" ++ ++#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "" --#: ftparchive/cachedb.cc:114 ++#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 ++#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format --msgid "File date has changed %s" ++msgid "Failed to stat %s" msgstr "" --#: ftparchive/cachedb.cc:155 ++#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" --#: ftparchive/cachedb.cc:267 ++#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" --#: ftparchive/writer.cc:78 ++#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" --#: ftparchive/writer.cc:83 ++#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" --#: ftparchive/writer.cc:125 ++#: ftparchive/writer.cc:135 msgid "E: " msgstr "" --#: ftparchive/writer.cc:127 ++#: ftparchive/writer.cc:137 msgid "W: " msgstr "" --#: ftparchive/writer.cc:134 ++#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "" --#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 ++#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "" --#: ftparchive/writer.cc:163 ++#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "" --#: ftparchive/writer.cc:188 ++#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "" --#: ftparchive/writer.cc:245 ++#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "" --#: ftparchive/writer.cc:253 ++#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "" --#: ftparchive/writer.cc:257 ++#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "" --#: ftparchive/writer.cc:264 ++#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "" --#: ftparchive/writer.cc:274 ++#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" --#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 --#, c-format --msgid "Failed to stat %s" --msgstr "" -- --#: ftparchive/writer.cc:386 ++#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "" --#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 ++#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr "" --#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 ++#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" ++#: ftparchive/writer.cc:623 ++#, c-format ++msgid " %s has no source override entry\n" ++msgstr "" ++ ++#: ftparchive/writer.cc:627 ++#, c-format ++msgid " %s has no binary override entry either\n" ++msgstr "" ++ #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@@ -1349,9 -1349,9 +1368,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 "" @@@ -1483,12 -1479,12 +1498,13 @@@ msgstr " msgid "File not found" msgstr "" - #: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133 - #: methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:275 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:266 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 ++#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@@ -1614,7 -1610,7 +1630,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" --#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 ++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1744,76 -1741,76 +1761,76 @@@ msgstr " msgid "Read error from %s process" msgstr "" --#: methods/http.cc:376 ++#: methods/http.cc:375 msgid "Waiting for headers" msgstr "" --#: methods/http.cc:522 ++#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "" --#: methods/http.cc:530 ++#: methods/http.cc:529 msgid "Bad header line" msgstr "" --#: methods/http.cc:549 methods/http.cc:556 ++#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "" --#: methods/http.cc:585 ++#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" --#: methods/http.cc:600 ++#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" --#: methods/http.cc:602 ++#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "" --#: methods/http.cc:626 ++#: methods/http.cc:625 msgid "Unknown date format" msgstr "" --#: methods/http.cc:773 ++#: methods/http.cc:772 msgid "Select failed" msgstr "" --#: methods/http.cc:778 ++#: methods/http.cc:777 msgid "Connection timed out" msgstr "" --#: methods/http.cc:801 ++#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" --#: methods/http.cc:832 ++#: methods/http.cc:831 msgid "Error writing to file" msgstr "" --#: methods/http.cc:860 ++#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" --#: methods/http.cc:874 ++#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" --#: methods/http.cc:876 ++#: methods/http.cc:875 msgid "Error reading from server" msgstr "" --#: methods/http.cc:1107 ++#: methods/http.cc:1106 msgid "Bad header data" msgstr "" --#: methods/http.cc:1124 ++#: methods/http.cc:1123 msgid "Connection failed" msgstr "" --#: methods/http.cc:1215 ++#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@@ -1826,7 -1823,7 +1843,7 @@@ msgstr " msgid "Couldn't make mmap of %lu bytes" msgstr "" --#: apt-pkg/contrib/strutl.cc:938 ++#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "" @@@ -2023,72 -2020,72 +2040,72 @@@ msgstr " msgid "Problem syncing the file" msgstr "" --#: apt-pkg/pkgcache.cc:126 ++#: apt-pkg/pkgcache.cc:137 msgid "Empty package cache" msgstr "" --#: apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is corrupted" msgstr "" --#: apt-pkg/pkgcache.cc:137 ++#: apt-pkg/pkgcache.cc:148 msgid "The package cache file is an incompatible version" msgstr "" --#: apt-pkg/pkgcache.cc:142 ++#: apt-pkg/pkgcache.cc:153 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" --#: apt-pkg/pkgcache.cc:147 ++#: apt-pkg/pkgcache.cc:158 msgid "The package cache was built for a different architecture" msgstr "" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:229 msgid "Depends" msgstr "" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:229 msgid "PreDepends" msgstr "" --#: apt-pkg/pkgcache.cc:218 ++#: apt-pkg/pkgcache.cc:229 msgid "Suggests" msgstr "" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:230 msgid "Recommends" msgstr "" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:230 msgid "Conflicts" msgstr "" --#: apt-pkg/pkgcache.cc:219 ++#: apt-pkg/pkgcache.cc:230 msgid "Replaces" msgstr "" --#: apt-pkg/pkgcache.cc:220 ++#: apt-pkg/pkgcache.cc:231 msgid "Obsoletes" msgstr "" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:242 msgid "important" msgstr "" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:242 msgid "required" msgstr "" --#: apt-pkg/pkgcache.cc:231 ++#: apt-pkg/pkgcache.cc:242 msgid "standard" msgstr "" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:243 msgid "optional" msgstr "" --#: apt-pkg/pkgcache.cc:232 ++#: apt-pkg/pkgcache.cc:243 msgid "extra" msgstr "" @@@ -2144,7 -2141,7 +2161,7 @@@ msgstr " msgid "Opening %s" msgstr "" --#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@@ -2223,12 -2227,12 +2247,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:123 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:136 ++#: apt-pkg/init.cc:139 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2271,110 -2275,110 +2295,125 @@@ 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:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 ++#: apt-pkg/acquire-item.cc:407 apt-pkg/acquire-item.cc:656 ++#: apt-pkg/acquire-item.cc:1399 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:645 -#: apt-pkg/acquire-item.cc:640 ++#: apt-pkg/acquire-item.cc:1094 msgid "There are no public key available for the following key IDs:\n" msgstr "" - #: apt-pkg/acquire-item.cc:758 -#: apt-pkg/acquire-item.cc:753 ++#: apt-pkg/acquire-item.cc:1207 #, 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:817 -#: apt-pkg/acquire-item.cc:812 ++#: apt-pkg/acquire-item.cc:1266 #, 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:853 -#: apt-pkg/acquire-item.cc:848 ++#: apt-pkg/acquire-item.cc:1302 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:940 -#: apt-pkg/acquire-item.cc:935 ++#: apt-pkg/acquire-item.cc:1389 msgid "Size mismatch" msgstr "" @@@ -2383,92 -2387,92 +2422,94 @@@ 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 msgid "Waiting for disc...\n" msgstr "" #. 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 msgid "Copying package lists..." msgstr "" --#: 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 "" @@@ -2520,9 -2524,9 +2561,13 @@@ msgstr " #: apt-pkg/deb/dpkgpm.cc:379 #, c-format - msgid "Removed with config %s" + msgid "Completely removed %s" + msgstr "" + ++#: methods/rred.cc:219 ++msgid "Could not patch file" +msgstr "" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr ""