From: Christian Perrier Date: Sat, 5 Mar 2005 09:28:33 +0000 (+0000) Subject: Merge with matt X-Git-Tag: 0.7.24ubuntu1~348^2~3 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2c01f1c077870be1fb00663fc6bb80366498efab?hp=-c Merge with matt Patches applied: * apt@packages.debian.org/apt--main--0--patch-59 Open 0.6.32 * apt@packages.debian.org/apt--main--0--patch-60 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-61 Add missing whitespace in new Debug::Acquire::gpgv output * apt@packages.debian.org/apt--main--0--patch-62 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-63 Open 0.6.34 * apt@packages.debian.org/apt--main--0--patch-64 Add missing semicolon in configure-index (Debian #295773) * apt@packages.debian.org/apt--main--0--patch-65 Update build-depends on gettext to 0.12 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-12 * star-merged with matt, removed the unset("no_proxy") in methods/ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-13 * commented the ftp no_proxy unseting in methods/ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-14 * starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-15 * merged with matt's tree * michael.vogt@canonical.com--2004/apt--mvo--0--patch-16 * added support for "Acquire::gpgv::options" in methods/gpgv.cc * michael.vogt@ubuntu.com--2005/apt--mvo--0--base-0 tag of michael.vogt@canonical.com--2004/apt--mvo--0--patch-16 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-1 * slightly cosmetic change in methods/gpgv.cc * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-2 * merge with matts tree, added documentation for the gpgv stuff * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-3 * added gpgv::Options to configure-index * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-4 * PulseIntervall can be configured now to make frontends like synaptic hayppy. it's done in a way that does not break binary compatibility * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-5 * fix for apt-get update removing the cdroms Release.gpg files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-6 * path scoring changed, the non-symlink path is scored highest --- 2c01f1c077870be1fb00663fc6bb80366498efab diff --combined po/apt-all.pot index bd6ad5d81,45ea52b09..9a974f7f6 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-02-25 14:16+0100\n" +"POT-Creation-Date: 2005-02-05 19:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -188,7 -188,7 +188,7 @@@ msgid " " -q Disable progress indicator.\n" " -i Show only important deps for the unmet command.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" @@@ -209,7 -209,7 +209,7 @@@ msgid " "Options:\n" " -h This help text.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" #: cmdline/apt-extracttemplates.cc:98 @@@ -228,7 -228,7 +228,7 @@@ msgid " " -h This help text\n" " -t Set the temp dir\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 @@@ -1053,7 -1053,7 +1053,7 @@@ msgid " " -b Build the source package after fetching it\n" " -V Show verbose version numbers\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" @@@ -1108,7 -1108,7 +1108,7 @@@ msgid " " -h This help text\n" " -s Use source file sorting\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" #: dselect/install:32 @@@ -2259,31 -2259,31 +2259,31 @@@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904 + #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:718 + #: apt-pkg/acquire-item.cc:708 #, 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:771 + #: apt-pkg/acquire-item.cc:761 #, 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:807 + #: apt-pkg/acquire-item.cc:797 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:894 + #: apt-pkg/acquire-item.cc:884 msgid "Size mismatch" msgstr "" @@@ -2292,73 -2292,73 +2292,73 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "" - #: apt-pkg/cdrom.cc:487 + #: apt-pkg/cdrom.cc:503 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578 + #: apt-pkg/cdrom.cc:512 apt-pkg/cdrom.cc:594 msgid "Identifying.. " msgstr "" - #: apt-pkg/cdrom.cc:521 + #: apt-pkg/cdrom.cc:537 #, c-format msgid "Stored Label: %s \n" msgstr "" - #: apt-pkg/cdrom.cc:541 + #: apt-pkg/cdrom.cc:557 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" - #: apt-pkg/cdrom.cc:559 + #: apt-pkg/cdrom.cc:575 msgid "Unmounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:563 + #: apt-pkg/cdrom.cc:579 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:571 + #: apt-pkg/cdrom.cc:587 msgid "Mounting CD-ROM...\n" msgstr "" - #: apt-pkg/cdrom.cc:589 + #: apt-pkg/cdrom.cc:605 msgid "Scanning Disc for index files..\n" msgstr "" - #: apt-pkg/cdrom.cc:627 + #: apt-pkg/cdrom.cc:643 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" - #: apt-pkg/cdrom.cc:684 + #: apt-pkg/cdrom.cc:700 msgid "That is not a valid name, try again.\n" msgstr "" - #: apt-pkg/cdrom.cc:700 + #: apt-pkg/cdrom.cc:716 #, c-format msgid "" "This Disc is called: \n" "'%s'\n" msgstr "" - #: apt-pkg/cdrom.cc:704 + #: apt-pkg/cdrom.cc:720 msgid "Copying package lists..." msgstr "" - #: apt-pkg/cdrom.cc:728 + #: apt-pkg/cdrom.cc:744 msgid "Writing new source list\n" msgstr "" - #: apt-pkg/cdrom.cc:737 + #: apt-pkg/cdrom.cc:753 msgid "Source List entries for this Disc are:\n" msgstr "" - #: apt-pkg/cdrom.cc:771 + #: apt-pkg/cdrom.cc:787 msgid "Unmounting CD-ROM..." msgstr ""