diff options
| -rw-r--r-- | apt-pkg/algorithms.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/cdrom.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 1 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 8 | ||||
| -rw-r--r-- | cmdline/apt-sortpkgs.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 6 | ||||
| -rw-r--r-- | ftparchive/apt-ftparchive.cc | 1 | ||||
| -rw-r--r-- | po/apt-all.pot | 211 |
11 files changed, 129 insertions, 110 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index bd8147291..93e26c7c6 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -26,6 +26,8 @@ #include <apti18n.h> #include <sys/types.h> +#include <cstdlib> +#include <algorithm> #include <iostream> /*}}}*/ using namespace std; diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index e61344eee..afa99bc73 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -18,6 +18,7 @@ #include <dirent.h> #include <unistd.h> #include <stdio.h> +#include <algorithm> #include "indexcopy.h" diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 9fd71728e..5d294c36a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -24,6 +24,7 @@ #include <apti18n.h> +#include <cstdlib> #include <iostream> #include <unistd.h> #include <fcntl.h> diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 37d263794..14ead61e1 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -28,6 +28,7 @@ #include <ctype.h> #include <string.h> #include <stdio.h> +#include <algorithm> #include <unistd.h> #include <regex.h> #include <errno.h> diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 579a19ab9..2f15486d9 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -14,6 +14,7 @@ #include <apti18n.h> #include <config.h> +#include <cstdlib> #include <sys/stat.h> /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 74824b6b0..1dcbbfc5b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2131,6 +2131,11 @@ bool DoSource(CommandLine &CmdL) I->Type != "tar") continue; + // Dsc only mode only fetches .dsc files + if (_config->FindB("APT::Get::Dsc-Only",false) == true && + I->Type != "dsc") + continue; + // don't download the same uri twice (should this be moved to // the fetcher interface itself?) if(queued.find(Last->Index().ArchiveURI(I->Path)) != queued.end()) @@ -2714,7 +2719,8 @@ int main(int argc,const char *argv[]) {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, - {0,"tar-only","APT::Get::tar-Only",0}, + {0,"tar-only","APT::Get::Tar-Only",0}, + {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, {0,"list-cleanup","APT::Get::List-Cleanup",0}, {0,"reinstall","APT::Get::ReInstall",0}, diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index e6a6b9a56..8909c3826 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -162,7 +162,7 @@ int ShowHelp() } /*}}}*/ -int main(unsigned int argc,const char *argv[]) +int main(int argc,const char *argv[]) { CommandLine::Args Args[] = { {'h',"help","help",0}, diff --git a/debian/changelog b/debian/changelog index 2504df8ce..05e3b58ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,11 @@ apt (0.7.2) unstable; urgency=low (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 <mvo@debian.org> Wed, 06 Jun 2007 23:19:50 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 9d30a176c..1bd21a5df 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -412,9 +412,9 @@ Item: <literal>APT::Get::Only-Source</literal>.</para></listitem> </varlistentry> - <varlistentry><term><option>--diff-only</option></term><term><option>--tar-only</option></term> - <listitem><para>Download only the diff or tar file of a source archive. - Configuration Item: <literal>APT::Get::Diff-Only</literal> and + <varlistentry><term><option>--diff-only</option></term><term><option>--dsc-only</option></term><term><option>--tar-only</option></term> + <listitem><para>Download only the diff, dsc, or tar file of a source archive. + Configuration Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</literal>, and <literal>APT::Get::Tar-Only</literal>.</para></listitem> </varlistentry> diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 0e2be8a00..4fbea13e1 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -24,6 +24,7 @@ #include <apti18n.h> #include <algorithm> +#include <climits> #include <sys/time.h> #include <regex.h> diff --git a/po/apt-all.pot b/po/apt-all.pot index 749d47844..a7185fcf3 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -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:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -155,8 +155,8 @@ msgid " %4i %s\n" msgstr "" #: 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:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -260,31 +260,31 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:342 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:184 +#: ftparchive/apt-ftparchive.cc:207 ftparchive/apt-ftparchive.cc:257 +#: ftparchive/apt-ftparchive.cc:271 ftparchive/apt-ftparchive.cc:293 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:255 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:372 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:402 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:557 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -326,11 +326,11 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:763 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:836 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" @@ -554,7 +554,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1659 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -713,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: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: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 +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:861 cmdline/apt-get.cc:2175 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -780,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:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2218 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -789,7 +789,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2227 msgid "Download complete and in download only mode" msgstr "" @@ -915,7 +915,7 @@ msgid "" "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 "" @@ -932,32 +932,32 @@ msgstr "" 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:1669 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1695 +#: 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: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: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 +965,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1731 +#: 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:1743 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1770 +#: cmdline/apt-get.cc:1774 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1859 +#: cmdline/apt-get.cc:1863 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1860 +#: cmdline/apt-get.cc:1864 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1888 +#: 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:1895 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1896 +#: cmdline/apt-get.cc:1900 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971 +#: 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: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: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:2154 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2169 +#: 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:2183 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2177 +#: 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:2192 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2214 +#: cmdline/apt-get.cc:2223 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2242 +#: 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:2263 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2255 +#: 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:2281 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2291 +#: cmdline/apt-get.cc:2300 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2307 +#: 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:2344 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2355 +#: cmdline/apt-get.cc:2364 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2407 +#: 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: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: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:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2533 +#: 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:2546 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2569 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2610 +#: cmdline/apt-get.cc:2619 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1132,6 +1132,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1598,7 +1599,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:472 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1610,7 +1611,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:511 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1877,7 +1878,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:981 +#: apt-pkg/contrib/strutl.cc:982 #, c-format msgid "Selection %s not found" msgstr "" @@ -2007,70 +2008,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:83 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:88 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:106 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:110 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:378 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:391 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:437 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:493 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:523 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:598 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:604 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:615 msgid "Problem syncing the file" msgstr "" @@ -2213,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:451 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2246,19 +2247,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:248 +#: 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:1110 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1106 +#: apt-pkg/algorithms.cc:1112 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2299,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:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:141 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2436,36 +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: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: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: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: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: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:1401 msgid "Size mismatch" msgstr "" @@ -2474,80 +2475,80 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:531 +#: 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:541 apt-pkg/cdrom.cc:623 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:565 +#: apt-pkg/cdrom.cc:566 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:585 +#: 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:604 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:607 +#: apt-pkg/cdrom.cc:608 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:616 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:633 +#: apt-pkg/cdrom.cc:634 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:673 +#: apt-pkg/cdrom.cc:674 #, c-format 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:711 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:739 +#: 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:756 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:759 +#: apt-pkg/cdrom.cc:760 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:785 +#: apt-pkg/cdrom.cc:786 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:794 +#: apt-pkg/cdrom.cc:795 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:836 +#: apt-pkg/cdrom.cc:837 msgid "Unmounting CD-ROM...\n" msgstr "" |