From: Michael Vogt Date: Wed, 6 Jun 2007 21:56:19 +0000 (+0200) Subject: * merged the debian/experimental changes back X-Git-Tag: 0.7.21~284 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/484dbb814fd2b787b2206ffe9504798dfd73ae6c?ds=inline;hp=--cc * merged the debian/experimental changes back into the debian/sid branch * merged from Christian Perrier: * mr.po: New Marathi translation Closes: #416806 * zh_CN.po: Updated by Eric Pareja Closes: #416822 * tl.po: Updated by Eric Pareja Closes: #416638 * gl.po: Updated by Jacobo Tarrio * da.po: Updated by Claus Hindsgaul * fr.po: Remove a non-breakable space for usability * ru.po: Updated Russian translation. Closes: #405476 * *.po: Unfuzzy after upstream typo corrections * buildlib/archtable: - added support for sh3/sh4 (closes: #424870) - added support for m32r (closes: #394096) * buildlib/systemtable: - added support for lpia * configure.in: - check systemtable for architecture mapping too * Package that contains tall the new features * Removed all #pragma interface/implementation * Branch that contains tall the new features: * translated package descriptions * task install support * automatic dependency removal (thanks to Daniel Burrows) * merged support for the new dpkg "Breaks" field (thanks to Ian Jackson) * handle network failures more gracefully on "update" * support for unattended-upgrades (via unattended-upgrades package) * added apt-transport-https method * merged "install-recommends" branch (ABI break): - new "--install-recommends" - install new recommends on "upgrade" if --install-recommends is given - new "--fix-policy" option to install all packages with unmet important dependencies (usefull with --install-recommends to see what not-installed recommends are on the system) - fix of recommended packages display (only show CandidateVersion fix or-group handling) * merged "install-task" branch (use with "apt-get install taskname^") * Applied patch from Daniel Schepler to make apt bin-NMU able. * eu.po: Updated * fix apt-get dist-upgrade * fix warning if no /var/lib/apt/extended_states is present * don't download Translations for deb-src sources.list lines * apt-pkg/tagfile.cc: - support not-mmapable files again * added support for i18n of the package descriptions * added support for aptitude like auto-install tracking (a HUGE HUGE thanks to Daniel Burrows who made this possible) * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental * apt-pkg/depcache.cc: - added Debug::pkgDepCache::AutoInstall (thanks to infinity) * apt-pkg/acquire-item.cc: - fix missing chmod() in the new aquire code (thanks to Bastian Blank, Closes: #367425) * merged from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: * sk.po: Completed to 512t * eu.po: Completed to 512t * fr.po: Completed to 512t * sv.po: Completed to 512t * Update all PO and the POT. Gives 506t6f for formerly complete translations * Fix a incorrect example in the man-page (closes: #282918) --- 484dbb814fd2b787b2206ffe9504798dfd73ae6c diff --cc apt-pkg/acquire-item.cc index b48972c22,3fd2304d2..3d05e62ae --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@@ -13,9 -13,9 +13,6 @@@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ --#ifdef __GNUG__ --#pragma implementation "apt-pkg/acquire-item.h" --#endif #include #include #include @@@ -818,12 -849,18 +845,18 @@@ void pkgAcqMetaSig::Done(string Message /*}}}*/ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { + string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); // if we get a network error we fail gracefully - if(LookupTag(Message,"FailReason") == "Timeout" || - LookupTag(Message,"FailReason") == "TmpResolveFailure" || - LookupTag(Message,"FailReason") == "ConnectionRefused") { + if(Status == StatTransientNetworkError) + { Item::Failed(Message,Cnf); - // move the sigfile back on network failures (and re-authenticated?) ++ // move the sigfile back on transient network failures + if(FileExists(DestFile)) + Rename(DestFile,Final); + + // set the status back to , Item::Failed likes to reset it + Status = pkgAcquire::Item::StatTransientNetworkError; return; } diff --cc apt-pkg/deb/debrecords.cc index 26ca36799,5eb2d67bb..2aa47e343 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@@ -89,12 -95,22 +95,25 @@@ string debRecordParser::ShortDesc( /* */ string debRecordParser::LongDesc() { - return Section.FindS("Description"); + string orig, dest; + char *codeset = nl_langinfo(CODESET); + + if (!Section.FindS("Description").empty()) + orig = Section.FindS("Description").c_str(); + else + orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str(); + + if (strcmp(codeset,"UTF-8") != 0) { + UTF8ToCodeset(codeset, orig, &dest); + orig = dest; + } + + return orig; } /*}}}*/ + +static const char *SourceVerSeparators = " ()"; + // RecordParser::SourcePkg - Return the source package name if any /*{{{*/ // --------------------------------------------------------------------- /* */ diff --cc configure.in index 4aa56e117,9fa113938..34d4dcc78 --- 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.47") -AC_DEFINE_UNQUOTED(VERSION,"0.7.0") ++AC_DEFINE_UNQUOTED(VERSION,"0.7.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --cc debian/changelog index 3e59aeb51,bbe4c0256..a57cf4577 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,5 +1,35 @@@ - apt (0.6.47) unstable; urgency=low ++apt (0.7.2) unstable; urgency=low ++ ++ * merged the debian/experimental changes back ++ into the debian/sid branch ++ * merged from Christian Perrier: ++ * mr.po: New Marathi translation Closes: #416806 ++ * zh_CN.po: Updated by Eric Pareja Closes: #416822 ++ * tl.po: Updated by Eric Pareja Closes: #416638 ++ * gl.po: Updated by Jacobo Tarrio ++ Closes: #412828 ++ * da.po: Updated by Claus Hindsgaul ++ Closes: #409483 ++ * fr.po: Remove a non-breakable space for usability ++ issues. Closes: #408877 ++ * ru.po: Updated Russian translation. Closes: #405476 ++ * *.po: Unfuzzy after upstream typo corrections ++ * buildlib/archtable: ++ - added support for sh3/sh4 (closes: #424870) ++ - added support for m32r (closes: #394096) ++ * buildlib/systemtable: ++ - added support for lpia ++ * configure.in: ++ - check systemtable for architecture mapping too ++ ++ -- Michael Vogt Wed, 06 Jun 2007 23:19:50 +0200 ++ + apt (0.7.1) experimental; urgency=low + * ABI library name change because its build against + new glibc + * implement SourceVer() in pkgRecords + (thanks to Daniel Burrows for the patch!) * apt-pkg/algorithm.cc: - use clog for all debugging - only increase the score of installed applications if they @@@ -37,35 -33,27 +63,33 @@@ issues. Closes: #408877 * ru.po: Updated Russian translation. Closes: #405476 * *.po: Unfuzzy after upstream typo corrections + * vi.po: Updated to 515t. Closes: #426976 + * eu.po: Updated to 515t. Closes: #423766 + * pt.po: 515t. Closes: #423111 + * fr.po: Updated by Christian Perrier + * Update all PO and the POT. Gives 513t2f for formerly + complete translations * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) - * merged from Christian Perrier: - * mr.po: New Marathi translation Closes: #416806 - * zh_CN.po: Updated by Eric Pareja Closes: #416822 - * tl.po: Updated by Eric Pareja Closes: #416638 - * gl.po: Updated by Jacobo Tarrio - Closes: #412828 - * da.po: Updated by Claus Hindsgaul - Closes: #409483 - * fr.po: Remove a non-breakable space for usability - issues. Closes: #408877 - * ru.po: Updated Russian translation. Closes: #405476 - * *.po: Unfuzzy after upstream typo corrections - * buildlib/archtable: - - added support for sh3/sh4 (closes: #424870) - - added support for m32r (closes: #394096) - * buildlib/systemtable: - - added support for lpia - * configure.in: - - check systemtable for architecture mapping too - - -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 + + -- Michael Vogt Wed, 2 May 2007 13:43:44 +0200 + + apt (0.7.0) experimental; urgency=low + + * Package that contains tall the new features + * Removed all #pragma interface/implementation + * Branch that contains tall the new features: + * translated package descriptions + * task install support + * automatic dependency removal (thanks to Daniel Burrows) + * merged support for the new dpkg "Breaks" field + (thanks to Ian Jackson) + * handle network failures more gracefully on "update" + * support for unattended-upgrades (via unattended-upgrades + package) + * added apt-transport-https method + + -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 apt (0.6.46.4-0.1) unstable; urgency=emergency @@@ -154,13 -142,21 +178,23 @@@ apt (0.6.46.2) unstable; urgency=lo apt (0.6.46.1) unstable; urgency=low + * merged "install-recommends" branch (ABI break): + - new "--install-recommends" + - install new recommends on "upgrade" if --install-recommends is + given + - new "--fix-policy" option to install all packages with unmet + important dependencies (usefull with --install-recommends to + see what not-installed recommends are on the system) + - fix of recommended packages display (only show CandidateVersion + fix or-group handling) + * merged "install-task" branch (use with "apt-get install taskname^") * methods/gzip.cc: - deal with empty files -- * Applied patch from Daniel Schepler to make apt bin-NMU able. ++ * Applied patch from Daniel Schepler to make apt bin-NMU able. + (closes: bug#359634) * rebuild against current g++ because of: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289 + (closes: #390189) * fix broken i18n in the dpkg progress reporting, thanks to Frans Pop and Steinar Gunderson. (closes: #389261) * Merged from Christian Perrier bzr branch: diff --cc po/apt-all.pot index 6237cd395,bd066ab06..749d47844 --- 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: 2007-05-08 11:09+0200\n" -"POT-Creation-Date: 2006-08-15 15:55+0200\n" ++"POT-Creation-Date: 2007-06-06 23:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -15,145 -15,153 +15,153 @@@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" - #: cmdline/apt-cache.cc:135 -#: cmdline/apt-cache.cc:141 ++#: cmdline/apt-cache.cc:143 #, 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 ++#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 ++#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 ++#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "" - #: cmdline/apt-cache.cc:232 -#: cmdline/apt-cache.cc:245 ++#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "" - #: cmdline/apt-cache.cc:272 -#: cmdline/apt-cache.cc:285 ++#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr "" - #: cmdline/apt-cache.cc:273 -#: cmdline/apt-cache.cc:286 ++#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "" - #: cmdline/apt-cache.cc:274 -#: cmdline/apt-cache.cc:287 ++#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr "" - #: cmdline/apt-cache.cc:275 -#: cmdline/apt-cache.cc:288 ++#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr "" - #: cmdline/apt-cache.cc:276 -#: cmdline/apt-cache.cc:289 ++#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "" - #: cmdline/apt-cache.cc:278 -#: cmdline/apt-cache.cc:291 ++#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "" - #: cmdline/apt-cache.cc:280 -#: cmdline/apt-cache.cc:293 ++#: cmdline/apt-cache.cc:295 + msgid "Total Distinct Descriptions: " + msgstr "" + -#: cmdline/apt-cache.cc:295 ++#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "" - #: cmdline/apt-cache.cc:283 -#: cmdline/apt-cache.cc:298 ++#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "" - #: cmdline/apt-cache.cc:285 -#: cmdline/apt-cache.cc:300 ++#: cmdline/apt-cache.cc:302 + msgid "Total Desc/File relations: " + msgstr "" + -#: cmdline/apt-cache.cc:302 ++#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" - #: cmdline/apt-cache.cc:297 -#: cmdline/apt-cache.cc:314 ++#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" - #: cmdline/apt-cache.cc:311 -#: cmdline/apt-cache.cc:328 ++#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" - #: cmdline/apt-cache.cc:316 -#: cmdline/apt-cache.cc:333 ++#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" - #: cmdline/apt-cache.cc:324 -#: cmdline/apt-cache.cc:341 ++#: cmdline/apt-cache.cc:343 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 ++#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "" - #: cmdline/apt-cache.cc:1231 -#: cmdline/apt-cache.cc:1287 ++#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" - #: cmdline/apt-cache.cc:1385 -#: cmdline/apt-cache.cc:1441 ++#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "" - #: cmdline/apt-cache.cc:1462 -#: cmdline/apt-cache.cc:1518 ++#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "" - #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 -#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 ++#: 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:1526 ++#: 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:1538 ++#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" - #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 -#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 ++#: 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:1571 ++#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "" - #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 -#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 ++#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version - #: cmdline/apt-cache.cc:1522 -#: cmdline/apt-cache.cc:1578 ++#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" - #: cmdline/apt-cache.cc:1532 -#: cmdline/apt-cache.cc:1588 ++#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables - #: cmdline/apt-cache.cc:1541 -#: cmdline/apt-cache.cc:1597 ++#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" - #: cmdline/apt-cache.cc:1556 -#: cmdline/apt-cache.cc:1612 ++#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" - #: 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-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2564 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" - #: cmdline/apt-cache.cc:1659 -#: cmdline/apt-cache.cc:1715 ++#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@@ -243,7 -251,8 +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:817 -#: apt-pkg/pkgcachegen.cc:819 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819 #, c-format msgid "Unable to write to %s" msgstr "" @@@ -546,7 -555,7 +554,7 @@@ msgstr " msgid "Y" msgstr "" - #: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -705,11 -714,11 +713,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" - #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@@ -738,7 -747,7 +746,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -772,7 -781,7 +780,7 @@@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -781,7 -790,7 +789,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218 msgid "Download complete and in download only mode" msgstr "" @@@ -881,37 -890,55 +889,75 @@@ msgstr " msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1384 -#: cmdline/apt-get.cc:1401 ++#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1403 -#: cmdline/apt-get.cc:1415 ++#: cmdline/apt-get.cc:1433 + msgid "We are not supposed to delete stuff, can't start AutoRemover" + msgstr "" + -#: cmdline/apt-get.cc:1440 ++#: cmdline/apt-get.cc:1465 ++msgid "" ++"The following packages were automatically installed and are no longer " ++"required:" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1467 ++msgid "Use 'apt-get autoremove' to remove them." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1472 + msgid "" + "Hmm, seems like the AutoRemover destroyed something which really\n" + "shouldn't happen. Please file a bug report against apt." + msgstr "" + -#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1736 + msgid "The following information may help to resolve the situation:" + msgstr "" + -#: cmdline/apt-get.cc:1447 ++#: cmdline/apt-get.cc:1479 + msgid "Internal Error, AutoRemover broke stuff" + msgstr "" + -#: cmdline/apt-get.cc:1466 ++#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 -#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597 ++#: cmdline/apt-get.cc:1543 ++#, c-format ++msgid "Couldn't find task %s" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1516 -#: cmdline/apt-get.cc:1584 ++#: cmdline/apt-get.cc:1665 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1546 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1695 ++#, c-format ++msgid "%s set to manual installed.\n" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1708 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1549 -#: cmdline/apt-get.cc:1617 ++#: cmdline/apt-get.cc:1711 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1561 -#: cmdline/apt-get.cc:1629 ++#: cmdline/apt-get.cc:1723 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -919,163 -946,159 +965,159 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1569 -#: cmdline/apt-get.cc:1637 ++#: cmdline/apt-get.cc:1731 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:1574 - msgid "The following information may help to resolve the situation:" - msgstr "" - - #: cmdline/apt-get.cc:1577 -#: cmdline/apt-get.cc:1645 ++#: cmdline/apt-get.cc:1739 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1603 -#: cmdline/apt-get.cc:1676 ++#: cmdline/apt-get.cc:1770 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1692 -#: cmdline/apt-get.cc:1765 ++#: cmdline/apt-get.cc:1859 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1693 -#: cmdline/apt-get.cc:1766 ++#: cmdline/apt-get.cc:1860 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1713 -#: cmdline/apt-get.cc:1786 ++#: cmdline/apt-get.cc:1888 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1721 -#: cmdline/apt-get.cc:1794 ++#: cmdline/apt-get.cc:1896 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 -#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 ++#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:1894 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2071 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 -#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:2043 ++#: cmdline/apt-get.cc:2145 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1992 -#: cmdline/apt-get.cc:2067 ++#: cmdline/apt-get.cc:2169 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1997 -#: cmdline/apt-get.cc:2072 ++#: cmdline/apt-get.cc:2174 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2000 -#: cmdline/apt-get.cc:2075 ++#: cmdline/apt-get.cc:2177 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2006 -#: cmdline/apt-get.cc:2081 ++#: cmdline/apt-get.cc:2183 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2037 -#: cmdline/apt-get.cc:2112 ++#: cmdline/apt-get.cc:2214 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2140 ++#: cmdline/apt-get.cc:2242 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2077 -#: cmdline/apt-get.cc:2152 ++#: cmdline/apt-get.cc:2254 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2078 -#: cmdline/apt-get.cc:2153 ++#: cmdline/apt-get.cc:2255 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2095 -#: cmdline/apt-get.cc:2170 ++#: cmdline/apt-get.cc:2272 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2114 -#: cmdline/apt-get.cc:2189 ++#: cmdline/apt-get.cc:2291 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2130 -#: cmdline/apt-get.cc:2205 ++#: cmdline/apt-get.cc:2307 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2158 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2335 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2178 -#: cmdline/apt-get.cc:2253 ++#: cmdline/apt-get.cc:2355 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2230 -#: cmdline/apt-get.cc:2305 ++#: cmdline/apt-get.cc:2407 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2282 -#: cmdline/apt-get.cc:2357 ++#: cmdline/apt-get.cc:2459 #, 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:2317 -#: cmdline/apt-get.cc:2392 ++#: cmdline/apt-get.cc:2494 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2342 -#: cmdline/apt-get.cc:2417 ++#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2431 ++#: cmdline/apt-get.cc:2533 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2360 -#: cmdline/apt-get.cc:2435 ++#: cmdline/apt-get.cc:2537 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2392 -#: cmdline/apt-get.cc:2467 ++#: cmdline/apt-get.cc:2569 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2433 -#: cmdline/apt-get.cc:2508 ++#: cmdline/apt-get.cc:2610 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1360,9 -1383,11 +1402,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:750 -#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 -#: apt-pkg/pkgcachegen.cc:947 apt-pkg/pkgcachegen.cc:752 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752 + #: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 + #: apt-pkg/pkgcachegen.cc:949 msgid "Reading package lists" msgstr "" @@@ -1490,12 -1516,14 +1532,13 @@@ msgstr " msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 -#: methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 - #: methods/gzip.cc:150 ++#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 -#: methods/rred.cc:240 methods/gzip.cc:147 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 ++#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@@ -1621,7 -1649,8 +1664,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" - #: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 -#: methods/http.cc:958 ++#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1752,76 -1781,77 +1795,76 @@@ msgstr " msgid "Read error from %s process" msgstr "" - #: methods/http.cc:377 -#: methods/http.cc:375 methods/http.cc:376 ++#: methods/http.cc:376 msgid "Waiting for headers" msgstr "" - #: methods/http.cc:523 -#: methods/http.cc:521 methods/http.cc:522 ++#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" - #: methods/http.cc:531 -#: methods/http.cc:529 methods/http.cc:530 ++#: methods/http.cc:530 msgid "Bad header line" msgstr "" - #: methods/http.cc:550 methods/http.cc:557 -#: methods/http.cc:548 methods/http.cc:555 methods/http.cc:549 -#: methods/http.cc:556 ++#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" - #: methods/http.cc:586 -#: methods/http.cc:584 methods/http.cc:585 ++#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" - #: methods/http.cc:601 -#: methods/http.cc:599 methods/http.cc:600 ++#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" - #: methods/http.cc:603 -#: methods/http.cc:601 methods/http.cc:602 ++#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" - #: methods/http.cc:627 -#: methods/http.cc:625 methods/http.cc:626 ++#: methods/http.cc:626 msgid "Unknown date format" msgstr "" - #: methods/http.cc:774 -#: methods/http.cc:772 methods/http.cc:773 ++#: methods/http.cc:773 msgid "Select failed" msgstr "" - #: methods/http.cc:779 -#: methods/http.cc:777 methods/http.cc:778 ++#: methods/http.cc:778 msgid "Connection timed out" msgstr "" - #: methods/http.cc:802 -#: methods/http.cc:800 methods/http.cc:801 ++#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" - #: methods/http.cc:833 -#: methods/http.cc:831 methods/http.cc:832 ++#: methods/http.cc:832 msgid "Error writing to file" msgstr "" - #: methods/http.cc:861 -#: methods/http.cc:859 methods/http.cc:860 ++#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" - #: methods/http.cc:875 -#: methods/http.cc:873 methods/http.cc:874 ++#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" - #: methods/http.cc:877 -#: methods/http.cc:875 methods/http.cc:876 ++#: methods/http.cc:876 msgid "Error reading from server" msgstr "" - #: methods/http.cc:1108 -#: methods/http.cc:1106 methods/http.cc:1107 ++#: methods/http.cc:1107 msgid "Bad header data" msgstr "" - #: methods/http.cc:1125 -#: methods/http.cc:1123 methods/http.cc:1124 ++#: methods/http.cc:1124 msgid "Connection failed" msgstr "" - #: methods/http.cc:1216 -#: methods/http.cc:1214 methods/http.cc:1215 ++#: methods/http.cc:1215 msgid "Internal error" msgstr "" @@@ -2031,88 -2061,104 +2074,106 @@@ msgstr " msgid "Problem syncing the file" msgstr "" - #: apt-pkg/pkgcache.cc:126 -#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 ++#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" - #: apt-pkg/pkgcache.cc:132 -#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 ++#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" - #: apt-pkg/pkgcache.cc:137 -#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 ++#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" - #: apt-pkg/pkgcache.cc:142 -#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 ++#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" - #: apt-pkg/pkgcache.cc:147 -#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 ++#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" - #: apt-pkg/pkgcache.cc:218 -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 ++#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "" - #: apt-pkg/pkgcache.cc:218 -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 ++#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "" - #: apt-pkg/pkgcache.cc:218 -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 ++#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "" - #: apt-pkg/pkgcache.cc:219 -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 ++#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "" - #: apt-pkg/pkgcache.cc:219 -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 ++#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "" - #: apt-pkg/pkgcache.cc:219 -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 ++#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "" - #: apt-pkg/pkgcache.cc:220 -#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 ++#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "" - #: apt-pkg/pkgcache.cc:231 -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 ++#: apt-pkg/pkgcache.cc:226 ++msgid "Breaks" ++msgstr "" ++ ++#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "" - #: apt-pkg/pkgcache.cc:231 -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 ++#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "" - #: apt-pkg/pkgcache.cc:231 -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 ++#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "" - #: apt-pkg/pkgcache.cc:232 -#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 ++#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "" - #: apt-pkg/pkgcache.cc:232 -#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 ++#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "" - #: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 -#: apt-pkg/depcache.cc:127 ++#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "" - #: apt-pkg/depcache.cc:62 -#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 ++#: apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "" - #: apt-pkg/depcache.cc:91 -#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 ++#: apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 + #: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 + msgid "Reading state information" + msgstr "" + -#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 ++#: apt-pkg/depcache.cc:196 + #, c-format + msgid "Failed to open StateFile %s" + msgstr "" + -#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 ++#: apt-pkg/depcache.cc:202 + #, c-format + msgid "Failed to write temporary StateFile %s" + msgstr "" + -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" @@@ -2172,7 -2218,7 +2233,7 @@@ msgstr " msgid "Malformed line %u in source list %s (vendor id)" msgstr "" - #: apt-pkg/packagemanager.cc:402 -#: apt-pkg/packagemanager.cc:402 apt-pkg/packagemanager.cc:403 ++#: apt-pkg/packagemanager.cc:403 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@@ -2185,19 -2231,19 +2246,19 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "" - #: apt-pkg/algorithms.cc:241 -#: apt-pkg/algorithms.cc:245 apt-pkg/algorithms.cc:248 ++#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" - #: apt-pkg/algorithms.cc:1066 -#: apt-pkg/algorithms.cc:1075 apt-pkg/algorithms.cc:1104 ++#: apt-pkg/algorithms.cc:1104 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" - #: apt-pkg/algorithms.cc:1068 -#: apt-pkg/algorithms.cc:1077 apt-pkg/algorithms.cc:1106 ++#: apt-pkg/algorithms.cc:1106 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@@ -2233,7 -2279,7 +2294,7 @@@ msgstr " msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/acquire-worker.cc:377 -#: apt-pkg/acquire-worker.cc:377 apt-pkg/acquire-worker.cc:384 ++#: apt-pkg/acquire-worker.cc:384 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@@ -2343,53 -2403,56 +2418,54 @@@ msgstr " msgid "Package %s %s was not found while processing file dependencies" msgstr "" - #: apt-pkg/pkgcachegen.cc:574 -#: apt-pkg/pkgcachegen.cc:681 apt-pkg/pkgcachegen.cc:682 ++#: apt-pkg/pkgcachegen.cc:682 #, c-format msgid "Couldn't stat source package list %s" msgstr "" - #: apt-pkg/pkgcachegen.cc:658 -#: apt-pkg/pkgcachegen.cc:765 apt-pkg/pkgcachegen.cc:767 ++#: apt-pkg/pkgcachegen.cc:767 msgid "Collecting File Provides" msgstr "" - #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 -#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 + #: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 msgid "IO Error saving source cache" msgstr "" - #: apt-pkg/acquire-item.cc:126 -#: apt-pkg/acquire-item.cc:130 ++#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 -#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 -#: apt-pkg/acquire-item.cc:1402 apt-pkg/acquire-item.cc:409 -#: apt-pkg/acquire-item.cc:666 apt-pkg/acquire-item.cc:1416 ++#: apt-pkg/acquire-item.cc:405 apt-pkg/acquire-item.cc:662 ++#: apt-pkg/acquire-item.cc:1412 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:647 -#: apt-pkg/acquire-item.cc:1097 -msgid "There are no public key available for the following key IDs:\n" ++#: apt-pkg/acquire-item.cc:1107 +msgid "There is no public key available for the following key IDs:\n" msgstr "" - #: apt-pkg/acquire-item.cc:760 -#: apt-pkg/acquire-item.cc:1210 apt-pkg/acquire-item.cc:1224 ++#: apt-pkg/acquire-item.cc:1220 #, 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:819 -#: apt-pkg/acquire-item.cc:1269 apt-pkg/acquire-item.cc:1283 ++#: apt-pkg/acquire-item.cc:1279 #, 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:855 -#: apt-pkg/acquire-item.cc:1305 apt-pkg/acquire-item.cc:1319 ++#: apt-pkg/acquire-item.cc:1315 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:942 -#: apt-pkg/acquire-item.cc:1392 apt-pkg/acquire-item.cc:1406 ++#: apt-pkg/acquire-item.cc:1402 msgid "Size mismatch" msgstr "" @@@ -2436,44 -2499,41 +2512,46 @@@ msgstr " 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:683 -#: apt-pkg/cdrom.cc:737 apt-pkg/cdrom.cc:739 ++#: apt-pkg/cdrom.cc:710 +#, c-format +msgid "Found label '%s'\n" +msgstr "" + - #: apt-pkg/cdrom.cc:712 ++#: apt-pkg/cdrom.cc:739 msgid "That is not a valid name, try again.\n" msgstr "" - #: apt-pkg/cdrom.cc:728 -#: apt-pkg/cdrom.cc:753 apt-pkg/cdrom.cc:755 ++#: apt-pkg/cdrom.cc:755 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" - #: apt-pkg/cdrom.cc:732 -#: apt-pkg/cdrom.cc:757 apt-pkg/cdrom.cc:759 ++#: apt-pkg/cdrom.cc:759 msgid "Copying package lists..." msgstr "" - #: apt-pkg/cdrom.cc:756 -#: apt-pkg/cdrom.cc:783 apt-pkg/cdrom.cc:785 ++#: apt-pkg/cdrom.cc:785 msgid "Writing new source list\n" msgstr "" - #: apt-pkg/cdrom.cc:765 -#: apt-pkg/cdrom.cc:792 apt-pkg/cdrom.cc:794 ++#: apt-pkg/cdrom.cc:794 msgid "Source list entries for this disc are:\n" msgstr "" - #: apt-pkg/cdrom.cc:807 -#: apt-pkg/cdrom.cc:832 apt-pkg/cdrom.cc:836 -msgid "Unmounting CD-ROM..." ++#: apt-pkg/cdrom.cc:836 +msgid "Unmounting CD-ROM...\n" msgstr "" - #: apt-pkg/indexcopy.cc:261 + #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr ""