From: Michael Vogt Date: Fri, 8 Jun 2007 21:12:26 +0000 (+0200) Subject: * add "purge" commandline argument, closes: #133421) X-Git-Tag: 0.7.21~280 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/859110cdec2f211beb45305134d095fd8926d552?hp=--cc * add "purge" commandline argument, closes: #133421) (thanks to Julien Danjou for the patch) * fix FTBFS with gcc 4.3, closes: #417090 (thanks to Martin Michlmayr for the patch) * add --dsc-only option, thanks to K. Richard Pixley --- 859110cdec2f211beb45305134d095fd8926d552 diff --cc apt-pkg/algorithms.cc index bd8147291,c6583f3b5..93e26c7c6 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@@ -20,12 -20,12 +20,14 @@@ #include #include #include +#include #include + #include - +#include + #include + #include #include /*}}}*/ using namespace std; diff --cc debian/changelog index 2504df8ce,dfdf0a401..05e3b58ef --- a/debian/changelog +++ b/debian/changelog @@@ -1,37 -1,5 +1,42 @@@ -apt (0.6.47) UNRELEASED; 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 + * fix error in AutocleanInterval, closes: #319339 + (thanks to Israel G. Lugo for the patch) + * add "purge" commandline argument, closes: #133421) + (thanks to Julien Danjou for the patch) ++ * add "purge" commandline argument, closes: #133421) ++ (thanks to Julien Danjou for the patch) ++ * fix FTBFS with gcc 4.3, closes: #417090 ++ (thanks to Martin Michlmayr for the patch) ++ * add --dsc-only option, thanks to K. Richard Pixley + + -- 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: diff --cc po/apt-all.pot index 749d47844,ad05fbdc8..a7185fcf3 --- 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-06-06 23:30+0200\n" -"POT-Creation-Date: 2007-06-08 23:06+0200\n" ++"POT-Creation-Date: 2007-06-08 23:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -154,9 -146,9 +154,9 @@@ msgstr " msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1652 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:2564 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:551 -#: cmdline/apt-get.cc:2396 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -554,7 -546,7 +554,7 @@@ msgstr " msgid "Y" msgstr "" - #: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1510 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1659 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -713,11 -705,11 +713,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" - #: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1822 cmdline/apt-get.cc:1855 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1903 cmdline/apt-get.cc:2144 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2321 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@@ -746,7 -738,7 +746,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1998 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2175 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -780,7 -772,7 +780,7 @@@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2041 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2218 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -789,7 -781,7 +789,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2050 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2227 msgid "Download complete and in download only mode" msgstr "" @@@ -895,69 -887,31 +895,69 @@@ msgid " "used instead." msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: 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:1475 cmdline/apt-get.cc:1736 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1740 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1479 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1497 cmdline/apt-get.cc:1533 +#: cmdline/apt-get.cc:1543 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + - #: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678 ++#: cmdline/apt-get.cc:1646 cmdline/apt-get.cc:1682 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1665 -#: cmdline/apt-get.cc:1520 ++#: cmdline/apt-get.cc:1669 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1695 -#: cmdline/apt-get.cc:1550 ++#: cmdline/apt-get.cc:1699 +#, c-format +msgid "%s set to manual installed.\n" +msgstr "" + - #: cmdline/apt-get.cc:1708 ++#: cmdline/apt-get.cc:1712 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1711 -#: cmdline/apt-get.cc:1553 ++#: cmdline/apt-get.cc:1715 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1723 -#: cmdline/apt-get.cc:1565 ++#: cmdline/apt-get.cc:1727 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" @@@ -965,159 -919,163 +965,159 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1731 -#: cmdline/apt-get.cc:1573 ++#: cmdline/apt-get.cc:1735 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:1739 -#: cmdline/apt-get.cc:1578 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1581 ++#: cmdline/apt-get.cc:1743 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1770 -#: cmdline/apt-get.cc:1607 ++#: cmdline/apt-get.cc:1774 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1859 -#: cmdline/apt-get.cc:1696 ++#: cmdline/apt-get.cc:1863 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1860 -#: cmdline/apt-get.cc:1697 ++#: cmdline/apt-get.cc:1864 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1888 -#: cmdline/apt-get.cc:1717 ++#: cmdline/apt-get.cc:1892 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1720 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1896 -#: cmdline/apt-get.cc:1725 ++#: cmdline/apt-get.cc:1900 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971 -#: cmdline/apt-get.cc:1790 cmdline/apt-get.cc:1798 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:2071 -#: cmdline/apt-get.cc:1898 ++#: cmdline/apt-get.cc:2075 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330 -#: cmdline/apt-get.cc:1928 cmdline/apt-get.cc:2162 ++#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2339 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:2145 -#: cmdline/apt-get.cc:1977 ++#: cmdline/apt-get.cc:2154 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" - #: cmdline/apt-get.cc:2169 -#: cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:2178 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:2174 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2183 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2177 -#: cmdline/apt-get.cc:2009 ++#: cmdline/apt-get.cc:2186 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2183 -#: cmdline/apt-get.cc:2015 ++#: cmdline/apt-get.cc:2192 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2214 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2223 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2242 -#: cmdline/apt-get.cc:2074 ++#: cmdline/apt-get.cc:2251 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2254 -#: cmdline/apt-get.cc:2086 ++#: cmdline/apt-get.cc:2263 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2255 -#: cmdline/apt-get.cc:2087 ++#: cmdline/apt-get.cc:2264 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2272 -#: cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:2281 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2123 ++#: cmdline/apt-get.cc:2300 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2307 -#: cmdline/apt-get.cc:2139 ++#: cmdline/apt-get.cc:2316 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2335 -#: cmdline/apt-get.cc:2167 ++#: cmdline/apt-get.cc:2344 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2355 -#: cmdline/apt-get.cc:2187 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2407 -#: cmdline/apt-get.cc:2239 ++#: cmdline/apt-get.cc:2416 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2459 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2468 #, 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:2494 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2519 -#: cmdline/apt-get.cc:2351 ++#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2533 -#: cmdline/apt-get.cc:2365 ++#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2537 -#: cmdline/apt-get.cc:2369 ++#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2569 -#: cmdline/apt-get.cc:2401 ++#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2610 -#: cmdline/apt-get.cc:2442 ++#: cmdline/apt-get.cc:2619 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1877,7 -1835,7 +1878,7 @@@ msgstr " msgid "Couldn't make mmap of %lu bytes" msgstr "" - #: apt-pkg/contrib/strutl.cc:981 -#: apt-pkg/contrib/strutl.cc:939 ++#: apt-pkg/contrib/strutl.cc:982 #, c-format msgid "Selection %s not found" msgstr "" @@@ -2213,7 -2153,7 +2214,7 @@@ msgstr " msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:427 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:451 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@@ -2246,19 -2186,19 +2247,19 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "" - #: apt-pkg/algorithms.cc:248 -#: apt-pkg/algorithms.cc:243 ++#: apt-pkg/algorithms.cc:254 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" - #: apt-pkg/algorithms.cc:1104 -#: apt-pkg/algorithms.cc:1068 ++#: apt-pkg/algorithms.cc:1110 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" - #: apt-pkg/algorithms.cc:1106 -#: apt-pkg/algorithms.cc:1070 ++#: apt-pkg/algorithms.cc:1112 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@@ -2299,12 -2239,12 +2300,12 @@@ msgstr " msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" - #: apt-pkg/init.cc:125 -#: apt-pkg/init.cc:121 ++#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" - #: apt-pkg/init.cc:141 -#: apt-pkg/init.cc:137 ++#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2436,36 -2362,35 +2437,36 @@@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:405 apt-pkg/acquire-item.cc:662 - #: apt-pkg/acquire-item.cc:1412 -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 ++#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 ++#: apt-pkg/acquire-item.cc:1411 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:1107 -#: apt-pkg/acquire-item.cc:647 ++#: apt-pkg/acquire-item.cc:1106 msgid "There is no public key available for the following key IDs:\n" msgstr "" - #: apt-pkg/acquire-item.cc:1220 -#: apt-pkg/acquire-item.cc:760 ++#: apt-pkg/acquire-item.cc:1219 #, 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:1279 -#: apt-pkg/acquire-item.cc:819 ++#: apt-pkg/acquire-item.cc:1278 #, 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:1315 -#: apt-pkg/acquire-item.cc:855 ++#: apt-pkg/acquire-item.cc:1314 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:1402 -#: apt-pkg/acquire-item.cc:942 ++#: apt-pkg/acquire-item.cc:1401 msgid "Size mismatch" msgstr "" @@@ -2474,80 -2399,78 +2475,80 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "" - #: apt-pkg/cdrom.cc:531 -#: apt-pkg/cdrom.cc:508 ++#: apt-pkg/cdrom.cc:532 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 -#: apt-pkg/cdrom.cc:517 apt-pkg/cdrom.cc:599 ++#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:623 msgid "Identifying.. " msgstr "" - #: apt-pkg/cdrom.cc:565 -#: apt-pkg/cdrom.cc:542 ++#: apt-pkg/cdrom.cc:566 #, c-format msgid "Stored label: %s \n" msgstr "" - #: apt-pkg/cdrom.cc:585 -#: apt-pkg/cdrom.cc:562 ++#: apt-pkg/cdrom.cc:586 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" - #: apt-pkg/cdrom.cc:603 -#: apt-pkg/cdrom.cc:580 ++#: apt-pkg/cdrom.cc:604 msgid "Unmounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:607 -#: apt-pkg/cdrom.cc:584 ++#: apt-pkg/cdrom.cc:608 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:615 -#: apt-pkg/cdrom.cc:592 ++#: apt-pkg/cdrom.cc:616 msgid "Mounting CD-ROM...\n" msgstr "" - #: apt-pkg/cdrom.cc:633 -#: apt-pkg/cdrom.cc:610 ++#: apt-pkg/cdrom.cc:634 msgid "Scanning disc for index files..\n" msgstr "" - #: apt-pkg/cdrom.cc:673 -#: apt-pkg/cdrom.cc:648 ++#: apt-pkg/cdrom.cc:674 #, 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:684 ++#: apt-pkg/cdrom.cc:711 #, c-format msgid "Found label '%s'\n" msgstr "" - #: apt-pkg/cdrom.cc:739 -#: apt-pkg/cdrom.cc:713 ++#: apt-pkg/cdrom.cc:740 msgid "That is not a valid name, try again.\n" msgstr "" - #: apt-pkg/cdrom.cc:755 -#: apt-pkg/cdrom.cc:729 ++#: apt-pkg/cdrom.cc:756 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" - #: apt-pkg/cdrom.cc:759 -#: apt-pkg/cdrom.cc:733 ++#: apt-pkg/cdrom.cc:760 msgid "Copying package lists..." msgstr "" - #: apt-pkg/cdrom.cc:785 -#: apt-pkg/cdrom.cc:757 ++#: apt-pkg/cdrom.cc:786 msgid "Writing new source list\n" msgstr "" - #: apt-pkg/cdrom.cc:794 -#: apt-pkg/cdrom.cc:766 ++#: apt-pkg/cdrom.cc:795 msgid "Source list entries for this disc are:\n" msgstr "" - #: apt-pkg/cdrom.cc:836 -#: apt-pkg/cdrom.cc:808 ++#: apt-pkg/cdrom.cc:837 msgid "Unmounting CD-ROM...\n" msgstr ""