From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 6 Sep 2005 09:51:40 +0000 (+0000)
Subject: * merged with michael.vogt@ubuntu.com--2005/apt--mvo--0 to be in sync with debian
X-Git-Tag: 0.7.21~334^2~6
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/09af1a917c739e50e4e8590cc8402525b3f1f64d

* merged with michael.vogt@ubuntu.com--2005/apt--mvo--0 to be in sync with debian


Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-1
   * merged with mainline and apt--fixes--0

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-2
   * patch from aj (slighly modified to use auto_ptr<>) applied

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-3
   * changelog updated

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-4
   * work for arch=all packages too now

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-5
   * merged with apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-6
   * fixed a incorrect po/he.po merge

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7
   * fixed incorrect man-page example

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8
   * changelog udpate

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-9
   * we only need to check once for xmlto

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-10
   * fix a bug in a man-page, fix a problem with overly long lines in apt-cdrom

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-11
   * merged with apt--main--0

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-12
   * fix a incorrect error message (it always added .gz regardless what was downloaded)

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-13
   * merged with main

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-14
   * added Hashsum support for file and cdrom

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-15
   * added README.arch

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-16
   * merged with main

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-17
   * move the changelog to the right place

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-18
   * Change pkgPolicy::Pin from private to protected

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-19
   * added a default constructor for PrvIterator

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-20
   * applied otavios patch to reread the statusFile on debSystem::Initialize

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-33
   * merged with matt's tree

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-34
   * merged with matts tree

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-35
   * build debian and ubuntu package from the same source

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-36
   * added debian/patches dir

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-37
   * fix the breakage from my last commit (note to self: always, _always_ run baz diff before a commit)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-38
   * removed the lsb_release build patch (nobody except me seems to like it)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-39
   * merged from main

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-40
   * merged the apt--sane-handle-timeout--0 branch

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-41
   * merged apt--bts225947--0

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-42
   * merged with apt--main

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-43
   * added patch that adds a apt-secure man-page (thanks to jfs@computer.org)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-44
   * added author credits

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-45
   * added apt-ftparchive.conf example

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-46
   * corrected the utf8 of javier fernandes pena

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-47
   * improve the timeout handling (again)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-48
   * merged with apt--fixes--0

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-49
   * README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators.h order in initlist changed to remove warning

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-50
   * meda-change message is send over status-fd now

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-51
   * include a human readable string for the MediaChange status-fd message as well

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-52
   * finalizing changelog

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-87

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-1
   * report timeouts (from Connect) and fail if they happen in pkgAcqMetaSig

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-2
   * merged with the fixes branch to make it build again

 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-3
   * merged with main

 * otavio@debian.org--2005/apt--fixes--0--patch-28
   Reread status configuration, needed for clients using independent apt ...
---

09af1a917c739e50e4e8590cc8402525b3f1f64d
diff --cc po/apt-all.pot
index d06c14ce1,c34299d26..46672e159
--- 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-06-06 14:00+0200\n"
 -"POT-Creation-Date: 2005-08-23 09:45+0200\n"
++"POT-Creation-Date: 2005-08-19 11:53+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"
@@@ -1270,8 -1295,8 +1270,8 @@@ msgstr "
  msgid "File %s/%s overwrites the one in the package %s"
  msgstr ""
  
- #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709
- #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
+ #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
  #, c-format
  msgid "Unable to read %s"
  msgstr ""
@@@ -1407,969 -1432,1061 +1407,1068 @@@ msgstr "
  msgid "Unparsable control file"
  msgstr ""
  
- #: methods/cdrom.cc:113
 -#: methods/cdrom.cc:114
 -#, c-format
 -msgid "Unable to read the cdrom database %s"
++#: apt-pkg/contrib/mmap.cc:82
++msgid "Can't mmap an empty file"
+ msgstr ""
+ 
 -#: methods/cdrom.cc:123
 -msgid ""
 -"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 -"cannot be used to add new CD-ROMs"
++#: apt-pkg/contrib/mmap.cc:87
 +#, c-format
- msgid "Unable to read the cdrom database %s"
++msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
  
- #: methods/cdrom.cc:122
- msgid ""
- "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
- "cannot be used to add new CD-ROMs"
 -#: methods/cdrom.cc:131 methods/cdrom.cc:169
 -msgid "Wrong CD-ROM"
++#: apt-pkg/contrib/strutl.cc:941
++#, c-format
++msgid "Selection %s not found"
  msgstr ""
  
- #: methods/cdrom.cc:130 methods/cdrom.cc:168
- msgid "Wrong CD-ROM"
 -#: methods/cdrom.cc:164
++#: apt-pkg/contrib/configuration.cc:436
+ #, c-format
 -msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
++msgid "Unrecognized type abbreviation: '%c'"
  msgstr ""
  
- #: methods/cdrom.cc:163
 -#: methods/cdrom.cc:178 methods/file.cc:79 methods/rsh.cc:264
 -msgid "File not found"
++#: apt-pkg/contrib/configuration.cc:494
 +#, c-format
- msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
++msgid "Opening configuration file %s"
  msgstr ""
  
- #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
- msgid "File not found"
 -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
 -#: methods/gzip.cc:142
 -msgid "Failed to stat"
++#: apt-pkg/contrib/configuration.cc:512
++#, c-format
++msgid "Line %d too long (max %d)"
  msgstr ""
  
- #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
- msgid "Failed to stat"
 -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
 -msgid "Failed to set modification time"
++#: apt-pkg/contrib/configuration.cc:608
++#, c-format
++msgid "Syntax error %s:%u: Block starts with no name."
  msgstr ""
  
- #: methods/copy.cc:79 methods/gzip.cc:139
- msgid "Failed to set modification time"
 -#: methods/file.cc:44
 -msgid "Invalid URI, local URIS must not start with //"
++#: apt-pkg/contrib/configuration.cc:627
++#, c-format
++msgid "Syntax error %s:%u: Malformed tag"
  msgstr ""
  
- #: methods/file.cc:42
- msgid "Invalid URI, local URIS must not start with //"
 -#. Login must be before getpeername otherwise dante won't work.
 -#: methods/ftp.cc:162
 -msgid "Logging in"
++#: apt-pkg/contrib/configuration.cc:644
++#, c-format
++msgid "Syntax error %s:%u: Extra junk after value"
  msgstr ""
  
- #. Login must be before getpeername otherwise dante won't work.
- #: methods/ftp.cc:162
- msgid "Logging in"
 -#: methods/ftp.cc:168
 -msgid "Unable to determine the peer name"
++#: apt-pkg/contrib/configuration.cc:684
++#, c-format
++msgid "Syntax error %s:%u: Directives can only be done at the top level"
  msgstr ""
  
- #: methods/ftp.cc:168
- msgid "Unable to determine the peer name"
 -#: methods/ftp.cc:173
 -msgid "Unable to determine the local name"
++#: apt-pkg/contrib/configuration.cc:691
++#, c-format
++msgid "Syntax error %s:%u: Too many nested includes"
  msgstr ""
  
- #: methods/ftp.cc:173
- msgid "Unable to determine the local name"
 -#: methods/ftp.cc:204 methods/ftp.cc:232
++#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+ #, c-format
 -msgid "The server refused the connection and said: %s"
++msgid "Syntax error %s:%u: Included from here"
  msgstr ""
  
- #: methods/ftp.cc:204 methods/ftp.cc:232
 -#: methods/ftp.cc:210
++#: apt-pkg/contrib/configuration.cc:704
  #, c-format
- msgid "The server refused the connection and said: %s"
 -msgid "USER failed, server said: %s"
++msgid "Syntax error %s:%u: Unsupported directive '%s'"
  msgstr ""
  
- #: methods/ftp.cc:210
 -#: methods/ftp.cc:217
++#: apt-pkg/contrib/configuration.cc:738
  #, c-format
- msgid "USER failed, server said: %s"
 -msgid "PASS failed, server said: %s"
++msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr ""
  
- #: methods/ftp.cc:217
 -#: methods/ftp.cc:237
 -msgid ""
 -"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 -"is empty."
++#: apt-pkg/contrib/progress.cc:154
 +#, c-format
- msgid "PASS failed, server said: %s"
++msgid "%c%s... Error!"
  msgstr ""
  
- #: methods/ftp.cc:237
- msgid ""
- "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
- "is empty."
 -#: methods/ftp.cc:265
++#: apt-pkg/contrib/progress.cc:156
+ #, c-format
 -msgid "Login script command '%s' failed, server said: %s"
++msgid "%c%s... Done"
  msgstr ""
  
- #: methods/ftp.cc:265
 -#: methods/ftp.cc:291
++#: apt-pkg/contrib/cmndline.cc:80
  #, c-format
- msgid "Login script command '%s' failed, server said: %s"
 -msgid "TYPE failed, server said: %s"
++msgid "Command line option '%c' [from %s] is not known."
  msgstr ""
  
- #: methods/ftp.cc:291
 -#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
 -msgid "Connection timeout"
++#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
++#: apt-pkg/contrib/cmndline.cc:122
 +#, c-format
- msgid "TYPE failed, server said: %s"
++msgid "Command line option %s is not understood"
  msgstr ""
  
- #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
- msgid "Connection timeout"
 -#: methods/ftp.cc:335
 -msgid "Server closed the connection"
++#: apt-pkg/contrib/cmndline.cc:127
++#, c-format
++msgid "Command line option %s is not boolean"
  msgstr ""
  
- #: methods/ftp.cc:335
- msgid "Server closed the connection"
 -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
 -msgid "Read error"
++#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
++#, c-format
++msgid "Option %s requires an argument."
  msgstr ""
  
- #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
- msgid "Read error"
 -#: methods/ftp.cc:345 methods/rsh.cc:197
 -msgid "A response overflowed the buffer."
++#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
++#, c-format
++msgid "Option %s: Configuration item specification must have an =<val>."
  msgstr ""
  
- #: methods/ftp.cc:345 methods/rsh.cc:197
- msgid "A response overflowed the buffer."
 -#: methods/ftp.cc:362 methods/ftp.cc:374
 -msgid "Protocol corruption"
++#: apt-pkg/contrib/cmndline.cc:237
++#, c-format
++msgid "Option %s requires an integer argument, not '%s'"
  msgstr ""
  
- #: methods/ftp.cc:362 methods/ftp.cc:374
- msgid "Protocol corruption"
 -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
 -msgid "Write error"
++#: apt-pkg/contrib/cmndline.cc:268
++#, c-format
++msgid "Option '%s' is too long"
  msgstr ""
  
- #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
- msgid "Write error"
 -#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 -msgid "Could not create a socket"
++#: apt-pkg/contrib/cmndline.cc:301
++#, c-format
++msgid "Sense %s is not understood, try true or false."
  msgstr ""
  
- #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
- msgid "Could not create a socket"
 -#: methods/ftp.cc:698
 -msgid "Could not connect data socket, connection timed out"
++#: apt-pkg/contrib/cmndline.cc:351
++#, c-format
++msgid "Invalid operation %s"
  msgstr ""
  
- #: methods/ftp.cc:698
- msgid "Could not connect data socket, connection timed out"
 -#: methods/ftp.cc:704
 -msgid "Could not connect passive socket."
++#: apt-pkg/contrib/cdromutl.cc:55
++#, c-format
++msgid "Unable to stat the mount point %s"
  msgstr ""
  
- #: methods/ftp.cc:704
- msgid "Could not connect passive socket."
 -#: methods/ftp.cc:722
 -msgid "getaddrinfo was unable to get a listening socket"
++#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
++#, c-format
++msgid "Unable to change to %s"
  msgstr ""
  
- #: methods/ftp.cc:722
- msgid "getaddrinfo was unable to get a listening socket"
 -#: methods/ftp.cc:736
 -msgid "Could not bind a socket"
++#: apt-pkg/contrib/cdromutl.cc:190
++msgid "Failed to stat the cdrom"
  msgstr ""
  
- #: methods/ftp.cc:736
- msgid "Could not bind a socket"
 -#: methods/ftp.cc:740
 -msgid "Could not listen on the socket"
++#: apt-pkg/contrib/fileutl.cc:82
++#, c-format
++msgid "Not using locking for read only lock file %s"
  msgstr ""
  
- #: methods/ftp.cc:740
- msgid "Could not listen on the socket"
 -#: methods/ftp.cc:747
 -msgid "Could not determine the socket's name"
++#: apt-pkg/contrib/fileutl.cc:87
++#, c-format
++msgid "Could not open lock file %s"
  msgstr ""
  
- #: methods/ftp.cc:747
- msgid "Could not determine the socket's name"
 -#: methods/ftp.cc:779
 -msgid "Unable to send PORT command"
++#: apt-pkg/contrib/fileutl.cc:105
++#, c-format
++msgid "Not using locking for nfs mounted lock file %s"
  msgstr ""
  
- #: methods/ftp.cc:779
- msgid "Unable to send PORT command"
 -#: methods/ftp.cc:789
++#: apt-pkg/contrib/fileutl.cc:109
+ #, c-format
 -msgid "Unknown address family %u (AF_*)"
++msgid "Could not get lock %s"
  msgstr ""
  
- #: methods/ftp.cc:789
 -#: methods/ftp.cc:798
++#: apt-pkg/contrib/fileutl.cc:377
  #, c-format
- msgid "Unknown address family %u (AF_*)"
 -msgid "EPRT failed, server said: %s"
++msgid "Waited for %s but it wasn't there"
  msgstr ""
  
- #: methods/ftp.cc:798
 -#: methods/ftp.cc:818
 -msgid "Data socket connect timed out"
++#: apt-pkg/contrib/fileutl.cc:387
 +#, c-format
- msgid "EPRT failed, server said: %s"
++msgid "Sub-process %s received a segmentation fault."
  msgstr ""
  
- #: methods/ftp.cc:818
- msgid "Data socket connect timed out"
 -#: methods/ftp.cc:825
 -msgid "Unable to accept connection"
++#: apt-pkg/contrib/fileutl.cc:390
++#, c-format
++msgid "Sub-process %s returned an error code (%u)"
  msgstr ""
  
- #: methods/ftp.cc:825
- msgid "Unable to accept connection"
 -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
 -msgid "Problem hashing file"
++#: apt-pkg/contrib/fileutl.cc:392
++#, c-format
++msgid "Sub-process %s exited unexpectedly"
  msgstr ""
  
- #: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
- msgid "Problem hashing file"
 -#: methods/ftp.cc:877
++#: apt-pkg/contrib/fileutl.cc:436
+ #, c-format
 -msgid "Unable to fetch file, server said '%s'"
++msgid "Could not open file %s"
  msgstr ""
  
- #: methods/ftp.cc:877
 -#: methods/ftp.cc:892 methods/rsh.cc:322
 -msgid "Data socket timed out"
++#: apt-pkg/contrib/fileutl.cc:471 methods/ftp.cc:338 methods/rsh.cc:190
++msgid "Read error"
+ msgstr ""
+ 
 -#: methods/ftp.cc:922
++#: apt-pkg/contrib/fileutl.cc:492
  #, c-format
- msgid "Unable to fetch file, server said '%s'"
 -msgid "Data transfer failed, server said '%s'"
 -msgstr ""
 -
 -#. Get the files information
 -#: methods/ftp.cc:997
 -msgid "Query"
++msgid "read, still have %lu to read but none left"
  msgstr ""
  
- #: methods/ftp.cc:892 methods/rsh.cc:322
- msgid "Data socket timed out"
 -#: methods/ftp.cc:1106
 -msgid "Unable to invoke "
++#: apt-pkg/contrib/fileutl.cc:510 methods/ftp.cc:446 methods/rsh.cc:232
++msgid "Write error"
  msgstr ""
  
- #: methods/ftp.cc:922
 -#: methods/connect.cc:64
++#: apt-pkg/contrib/fileutl.cc:522
  #, c-format
- msgid "Data transfer failed, server said '%s'"
 -msgid "Connecting to %s (%s)"
++msgid "write, still have %lu to write but couldn't"
  msgstr ""
  
- #. Get the files information
- #: methods/ftp.cc:997
- msgid "Query"
 -#: methods/connect.cc:71
 -#, c-format
 -msgid "[IP: %s %s]"
++#: apt-pkg/contrib/fileutl.cc:597
++msgid "Problem closing the file"
  msgstr ""
  
- #: methods/ftp.cc:1106
- msgid "Unable to invoke "
 -#: methods/connect.cc:80
 -#, c-format
 -msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
++#: apt-pkg/contrib/fileutl.cc:603
++msgid "Problem unlinking the file"
  msgstr ""
  
- #: methods/connect.cc:64
 -#: methods/connect.cc:86
--#, c-format
- msgid "Connecting to %s (%s)"
 -msgid "Cannot initiate the connection to %s:%s (%s)."
++#: apt-pkg/contrib/fileutl.cc:614
++msgid "Problem syncing the file"
  msgstr ""
  
- #: methods/connect.cc:71
 -#: methods/connect.cc:93
--#, c-format
- msgid "[IP: %s %s]"
 -msgid "Could not connect to %s:%s (%s), connection timed out"
++#: apt-pkg/pkgcache.cc:126
++msgid "Empty package cache"
  msgstr ""
  
- #: methods/connect.cc:80
 -#: methods/connect.cc:106
--#, c-format
- msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 -msgid "Could not connect to %s:%s (%s)."
++#: apt-pkg/pkgcache.cc:132
++msgid "The package cache file is corrupted"
  msgstr ""
  
- #: methods/connect.cc:86
 -#. We say this mainly because the pause here is for the
 -#. ssh connection that is still going
 -#: methods/connect.cc:134 methods/rsh.cc:425
--#, c-format
- msgid "Cannot initiate the connection to %s:%s (%s)."
 -msgid "Connecting to %s"
++#: apt-pkg/pkgcache.cc:137
++msgid "The package cache file is an incompatible version"
  msgstr ""
  
- #: methods/connect.cc:92
 -#: methods/connect.cc:165
++#: apt-pkg/pkgcache.cc:142
  #, c-format
- msgid "Could not connect to %s:%s (%s), connection timed out"
 -msgid "Could not resolve '%s'"
++msgid "This APT does not support the versioning system '%s'"
  msgstr ""
  
- #: methods/connect.cc:104
 -#: methods/connect.cc:171
--#, c-format
- msgid "Could not connect to %s:%s (%s)."
 -msgid "Temporary failure resolving '%s'"
++#: apt-pkg/pkgcache.cc:147
++msgid "The package cache was built for a different architecture"
  msgstr ""
  
- #. We say this mainly because the pause here is for the
- #. ssh connection that is still going
- #: methods/connect.cc:132 methods/rsh.cc:425
 -#: methods/connect.cc:174
 -#, c-format
 -msgid "Something wicked happened resolving '%s:%s' (%i)"
++#: apt-pkg/pkgcache.cc:218
++msgid "Depends"
+ msgstr ""
+ 
 -#: methods/connect.cc:221
 -#, c-format
 -msgid "Unable to connect to %s %s:"
++#: apt-pkg/pkgcache.cc:218
++msgid "PreDepends"
+ msgstr ""
+ 
 -#: methods/gpgv.cc:92
 -msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
++#: apt-pkg/pkgcache.cc:218
++msgid "Suggests"
+ msgstr ""
+ 
 -#: methods/gpgv.cc:191
 -msgid ""
 -"Internal error: Good signature, but could not determine key fingerprint?!"
++#: apt-pkg/pkgcache.cc:219
++msgid "Recommends"
+ msgstr ""
+ 
 -#: methods/gpgv.cc:196
 -msgid "At least one invalid signature was encountered."
++#: apt-pkg/pkgcache.cc:219
++msgid "Conflicts"
+ msgstr ""
+ 
 -#. FIXME String concatenation considered harmful.
 -#: methods/gpgv.cc:201
 -msgid "Could not execute "
++#: apt-pkg/pkgcache.cc:219
++msgid "Replaces"
+ msgstr ""
+ 
 -#: methods/gpgv.cc:202
 -msgid " to verify signature (is gnupg installed?)"
++#: apt-pkg/pkgcache.cc:220
++msgid "Obsoletes"
+ msgstr ""
+ 
 -#: methods/gpgv.cc:206
 -msgid "Unknown error executing gpgv"
++#: apt-pkg/pkgcache.cc:231
++msgid "important"
+ msgstr ""
+ 
 -#: methods/gpgv.cc:237
 -msgid "The following signatures were invalid:\n"
++#: apt-pkg/pkgcache.cc:231
++msgid "required"
+ msgstr ""
+ 
 -#: methods/gpgv.cc:244
 -msgid ""
 -"The following signatures couldn't be verified because the public key is not "
 -"available:\n"
++#: apt-pkg/pkgcache.cc:231
++msgid "standard"
+ msgstr ""
+ 
 -#: methods/gzip.cc:57
 -#, c-format
 -msgid "Couldn't open pipe for %s"
++#: apt-pkg/pkgcache.cc:232
++msgid "optional"
+ msgstr ""
+ 
 -#: methods/gzip.cc:102
 -#, c-format
 -msgid "Read error from %s process"
++#: apt-pkg/pkgcache.cc:232
++msgid "extra"
+ msgstr ""
+ 
 -#: methods/http.cc:344
 -msgid "Waiting for headers"
++#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++msgid "Building dependency tree"
+ msgstr ""
+ 
 -#: methods/http.cc:490
 -#, c-format
 -msgid "Got a single header line over %u chars"
++#: apt-pkg/depcache.cc:61
++msgid "Candidate versions"
+ msgstr ""
+ 
 -#: methods/http.cc:498
 -msgid "Bad header line"
++#: apt-pkg/depcache.cc:90
++msgid "Dependency generation"
+ msgstr ""
+ 
 -#: methods/http.cc:517 methods/http.cc:524
 -msgid "The HTTP server sent an invalid reply header"
++#: apt-pkg/tagfile.cc:73
 +#, c-format
- msgid "Connecting to %s"
++msgid "Unable to parse package file %s (1)"
  msgstr ""
  
- #: methods/connect.cc:163
 -#: methods/http.cc:553
 -msgid "The HTTP server sent an invalid Content-Length header"
++#: apt-pkg/tagfile.cc:160
 +#, c-format
- msgid "Could not resolve '%s'"
++msgid "Unable to parse package file %s (2)"
  msgstr ""
  
- #: methods/connect.cc:167
 -#: methods/http.cc:568
 -msgid "The HTTP server sent an invalid Content-Range header"
++#: apt-pkg/sourcelist.cc:87
 +#, c-format
- msgid "Temporary failure resolving '%s'"
++msgid "Malformed line %lu in source list %s (URI)"
  msgstr ""
  
- #: methods/connect.cc:169
 -#: methods/http.cc:570
 -msgid "This HTTP server has broken range support"
++#: apt-pkg/sourcelist.cc:89
 +#, c-format
- msgid "Something wicked happened resolving '%s:%s' (%i)"
++msgid "Malformed line %lu in source list %s (dist)"
  msgstr ""
  
- #: methods/connect.cc:216
 -#: methods/http.cc:594
 -msgid "Unknown date format"
++#: apt-pkg/sourcelist.cc:92
 +#, c-format
- msgid "Unable to connect to %s %s:"
++msgid "Malformed line %lu in source list %s (URI parse)"
  msgstr ""
  
- #: methods/gzip.cc:57
 -#: methods/http.cc:741
 -msgid "Select failed"
++#: apt-pkg/sourcelist.cc:98
 +#, c-format
- msgid "Couldn't open pipe for %s"
++msgid "Malformed line %lu in source list %s (absolute dist)"
  msgstr ""
  
- #: methods/gzip.cc:102
 -#: methods/http.cc:746
 -msgid "Connection timed out"
++#: apt-pkg/sourcelist.cc:105
 +#, c-format
- msgid "Read error from %s process"
++msgid "Malformed line %lu in source list %s (dist parse)"
  msgstr ""
  
- #: methods/http.cc:344
- msgid "Waiting for headers"
 -#: methods/http.cc:769
 -msgid "Error writing to output file"
++#: apt-pkg/sourcelist.cc:156
++#, c-format
++msgid "Opening %s"
  msgstr ""
  
- #: methods/http.cc:490
 -#: methods/http.cc:797
 -msgid "Error writing to file"
++#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
 +#, c-format
- msgid "Got a single header line over %u chars"
++msgid "Line %u too long in source list %s."
  msgstr ""
  
- #: methods/http.cc:498
- msgid "Bad header line"
 -#: methods/http.cc:822
 -msgid "Error writing to the file"
++#: apt-pkg/sourcelist.cc:187
++#, c-format
++msgid "Malformed line %u in source list %s (type)"
  msgstr ""
  
- #: methods/http.cc:517 methods/http.cc:524
- msgid "The HTTP server sent an invalid reply header"
 -#: methods/http.cc:836
 -msgid "Error reading from server. Remote end closed connection"
++#: apt-pkg/sourcelist.cc:191
++#, c-format
++msgid "Type '%s' is not known on line %u in source list %s"
  msgstr ""
  
- #: methods/http.cc:553
- msgid "The HTTP server sent an invalid Content-Length header"
 -#: methods/http.cc:838
 -msgid "Error reading from server"
++#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
++#, c-format
++msgid "Malformed line %u in source list %s (vendor id)"
  msgstr ""
  
- #: methods/http.cc:568
- msgid "The HTTP server sent an invalid Content-Range header"
 -#: methods/http.cc:1069
 -msgid "Bad header data"
++#: apt-pkg/packagemanager.cc:402
++#, c-format
++msgid ""
++"This installation run will require temporarily removing the essential "
++"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
++"you really want to do it, activate the APT::Force-LoopBreak option."
  msgstr ""
  
- #: methods/http.cc:570
- msgid "This HTTP server has broken range support"
 -#: methods/http.cc:1086
 -msgid "Connection failed"
++#: apt-pkg/pkgrecords.cc:37
++#, c-format
++msgid "Index file type '%s' is not supported"
  msgstr ""
  
- #: methods/http.cc:594
- msgid "Unknown date format"
 -#: methods/http.cc:1177
 -msgid "Internal error"
++#: apt-pkg/algorithms.cc:241
++#, c-format
++msgid ""
++"The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
- #: methods/http.cc:741
- msgid "Select failed"
 -#: apt-pkg/contrib/mmap.cc:82
 -msgid "Can't mmap an empty file"
++#: apt-pkg/algorithms.cc:1059
++msgid ""
++"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
++"held packages."
  msgstr ""
  
- #: methods/http.cc:746
- msgid "Connection timed out"
 -#: apt-pkg/contrib/mmap.cc:87
 -#, c-format
 -msgid "Couldn't make mmap of %lu bytes"
++#: apt-pkg/algorithms.cc:1061
++msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
- #: methods/http.cc:769
- msgid "Error writing to output file"
 -#: apt-pkg/contrib/strutl.cc:941
++#: apt-pkg/acquire.cc:62
+ #, c-format
 -msgid "Selection %s not found"
++msgid "Lists directory %spartial is missing."
  msgstr ""
  
- #: methods/http.cc:797
- msgid "Error writing to file"
 -#: apt-pkg/contrib/configuration.cc:436
++#: apt-pkg/acquire.cc:66
+ #, c-format
 -msgid "Unrecognized type abbreviation: '%c'"
++msgid "Archive directory %spartial is missing."
  msgstr ""
  
- #: methods/http.cc:822
- msgid "Error writing to the file"
 -#: apt-pkg/contrib/configuration.cc:494
++#: apt-pkg/acquire.cc:821
+ #, c-format
 -msgid "Opening configuration file %s"
++msgid "Downloading file %li of %li (%s remaining)"
  msgstr ""
  
- #: methods/http.cc:836
- msgid "Error reading from server. Remote end closed connection"
 -#: apt-pkg/contrib/configuration.cc:512
++#: apt-pkg/acquire-worker.cc:113 apt-pkg/acquire-worker.cc:112
+ #, c-format
 -msgid "Line %d too long (max %d)"
++msgid "The method driver %s could not be found."
  msgstr ""
  
- #: methods/http.cc:838
- msgid "Error reading from server"
 -#: apt-pkg/contrib/configuration.cc:608
++#: apt-pkg/acquire-worker.cc:162 apt-pkg/acquire-worker.cc:161
+ #, c-format
 -msgid "Syntax error %s:%u: Block starts with no name."
++msgid "Method %s did not start correctly"
  msgstr ""
  
- #: methods/http.cc:1069
- msgid "Bad header data"
 -#: apt-pkg/contrib/configuration.cc:627
++#: apt-pkg/acquire-worker.cc:377
+ #, c-format
 -msgid "Syntax error %s:%u: Malformed tag"
++msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
- #: methods/http.cc:1086
- msgid "Connection failed"
 -#: apt-pkg/contrib/configuration.cc:644
++#: apt-pkg/init.cc:119
+ #, c-format
 -msgid "Syntax error %s:%u: Extra junk after value"
++msgid "Packaging system '%s' is not supported"
  msgstr ""
  
- #: methods/http.cc:1177
- msgid "Internal error"
 -#: apt-pkg/contrib/configuration.cc:684
 -#, c-format
 -msgid "Syntax error %s:%u: Directives can only be done at the top level"
++#: apt-pkg/init.cc:135
++msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
- #: methods/rsh.cc:330
- msgid "Connection closed prematurely"
 -#: apt-pkg/contrib/configuration.cc:691
++#: apt-pkg/clean.cc:61
+ #, c-format
 -msgid "Syntax error %s:%u: Too many nested includes"
++msgid "Unable to stat %s."
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:82
- msgid "Can't mmap an empty file"
 -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
 -#, c-format
 -msgid "Syntax error %s:%u: Included from here"
++#: apt-pkg/srcrecords.cc:48
++msgid "You must put some 'source' URIs in your sources.list"
  msgstr ""
  
- #: apt-pkg/contrib/mmap.cc:87
 -#: apt-pkg/contrib/configuration.cc:704
--#, c-format
- msgid "Couldn't make mmap of %lu bytes"
 -msgid "Syntax error %s:%u: Unsupported directive '%s'"
++#: apt-pkg/cachefile.cc:73
++msgid "The package lists or status file could not be parsed or opened."
  msgstr ""
  
- #: apt-pkg/contrib/strutl.cc:941
 -#: apt-pkg/contrib/configuration.cc:738
--#, c-format
- msgid "Selection %s not found"
 -msgid "Syntax error %s:%u: Extra junk at end of file"
++#: apt-pkg/cachefile.cc:77
++msgid "You may want to run apt-get update to correct these problems"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:395
 -#: apt-pkg/contrib/progress.cc:154
--#, c-format
- msgid "Unrecognized type abbreviation: '%c'"
 -msgid "%c%s... Error!"
++#: apt-pkg/policy.cc:269
++msgid "Invalid record in the preferences file, no Package header"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:453
 -#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/policy.cc:291
  #, c-format
- msgid "Opening configuration file %s"
 -msgid "%c%s... Done"
++msgid "Did not understand pin type %s"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:471
 -#: apt-pkg/contrib/cmndline.cc:80
--#, c-format
- msgid "Line %d too long (max %d)"
 -msgid "Command line option '%c' [from %s] is not known."
++#: apt-pkg/policy.cc:299
++msgid "No priority (or zero) specified for pin"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:567
 -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
 -#: apt-pkg/contrib/cmndline.cc:122
--#, c-format
- msgid "Syntax error %s:%u: Block starts with no name."
 -msgid "Command line option %s is not understood"
++#: apt-pkg/pkgcachegen.cc:74
++msgid "Cache has an incompatible versioning system"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:586
 -#: apt-pkg/contrib/cmndline.cc:127
++#: apt-pkg/pkgcachegen.cc:117
  #, c-format
- msgid "Syntax error %s:%u: Malformed tag"
 -msgid "Command line option %s is not boolean"
++msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:603
 -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
++#: apt-pkg/pkgcachegen.cc:129
  #, c-format
- msgid "Syntax error %s:%u: Extra junk after value"
 -msgid "Option %s requires an argument."
++msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:643
 -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
++#: apt-pkg/pkgcachegen.cc:150
  #, c-format
- msgid "Syntax error %s:%u: Directives can only be done at the top level"
 -msgid "Option %s: Configuration item specification must have an =<val>."
++msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:650
 -#: apt-pkg/contrib/cmndline.cc:237
++#: apt-pkg/pkgcachegen.cc:154
  #, c-format
- msgid "Syntax error %s:%u: Too many nested includes"
 -msgid "Option %s requires an integer argument, not '%s'"
++msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659
 -#: apt-pkg/contrib/cmndline.cc:268
++#: apt-pkg/pkgcachegen.cc:184
  #, c-format
- msgid "Syntax error %s:%u: Included from here"
 -msgid "Option '%s' is too long"
++msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:663
 -#: apt-pkg/contrib/cmndline.cc:301
++#: apt-pkg/pkgcachegen.cc:188
  #, c-format
- msgid "Syntax error %s:%u: Unsupported directive '%s'"
 -msgid "Sense %s is not understood, try true or false."
++msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
- #: apt-pkg/contrib/configuration.cc:697
 -#: apt-pkg/contrib/cmndline.cc:351
++#: apt-pkg/pkgcachegen.cc:192
  #, c-format
- msgid "Syntax error %s:%u: Extra junk at end of file"
 -msgid "Invalid operation %s"
++msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
- #: apt-pkg/contrib/progress.cc:154
 -#: apt-pkg/contrib/cdromutl.cc:55
--#, c-format
- msgid "%c%s... Error!"
 -msgid "Unable to stat the mount point %s"
++#: apt-pkg/pkgcachegen.cc:207
++msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
- #: apt-pkg/contrib/progress.cc:156
 -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
--#, c-format
- msgid "%c%s... Done"
 -msgid "Unable to change to %s"
++#: apt-pkg/pkgcachegen.cc:210
++msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:80
- #, c-format
- msgid "Command line option '%c' [from %s] is not known."
 -#: apt-pkg/contrib/cdromutl.cc:190
 -msgid "Failed to stat the cdrom"
++#: apt-pkg/pkgcachegen.cc:213
++msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
- #: apt-pkg/contrib/cmndline.cc:122
 -#: apt-pkg/contrib/fileutl.cc:82
++#: apt-pkg/pkgcachegen.cc:241
  #, c-format
- msgid "Command line option %s is not understood"
 -msgid "Not using locking for read only lock file %s"
++msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:127
 -#: apt-pkg/contrib/fileutl.cc:87
++#: apt-pkg/pkgcachegen.cc:254
  #, c-format
- msgid "Command line option %s is not boolean"
 -msgid "Could not open lock file %s"
++msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 -#: apt-pkg/contrib/fileutl.cc:105
++#: apt-pkg/pkgcachegen.cc:260
  #, c-format
- msgid "Option %s requires an argument."
 -msgid "Not using locking for nfs mounted lock file %s"
++msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
 -#: apt-pkg/contrib/fileutl.cc:109
++#: apt-pkg/pkgcachegen.cc:574
  #, c-format
- msgid "Option %s: Configuration item specification must have an =<val>."
 -msgid "Could not get lock %s"
++msgid "Couldn't stat source package list %s"
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:237
 -#: apt-pkg/contrib/fileutl.cc:377
--#, c-format
- msgid "Option %s requires an integer argument, not '%s'"
 -msgid "Waited for %s but it wasn't there"
++#: apt-pkg/pkgcachegen.cc:658
++msgid "Collecting File Provides"
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:268
 -#: apt-pkg/contrib/fileutl.cc:387
--#, c-format
- msgid "Option '%s' is too long"
 -msgid "Sub-process %s received a segmentation fault."
++#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++msgid "IO Error saving source cache"
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:301
 -#: apt-pkg/contrib/fileutl.cc:390
++#: apt-pkg/acquire-item.cc:129
  #, c-format
- msgid "Sense %s is not understood, try true or false."
 -msgid "Sub-process %s returned an error code (%u)"
++msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
- #: apt-pkg/contrib/cmndline.cc:351
 -#: apt-pkg/contrib/fileutl.cc:392
--#, c-format
- msgid "Invalid operation %s"
 -msgid "Sub-process %s exited unexpectedly"
++#: apt-pkg/acquire-item.cc:618 apt-pkg/acquire-item.cc:1290
++#: apt-pkg/acquire-item.cc:553 apt-pkg/acquire-item.cc:1218
++msgid "MD5Sum mismatch"
  msgstr ""
  
- #: apt-pkg/contrib/cdromutl.cc:55
 -#: apt-pkg/contrib/fileutl.cc:436
++#: apt-pkg/acquire-item.cc:1104 apt-pkg/acquire-item.cc:1032
  #, c-format
- msgid "Unable to stat the mount point %s"
 -msgid "Could not open file %s"
++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/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
 -#: apt-pkg/contrib/fileutl.cc:492
++#: apt-pkg/acquire-item.cc:1157 apt-pkg/acquire-item.cc:1085
  #, c-format
- msgid "Unable to change to %s"
 -msgid "read, still have %lu to read but none left"
++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/contrib/cdromutl.cc:190
- msgid "Failed to stat the cdrom"
 -#: apt-pkg/contrib/fileutl.cc:522
++#: apt-pkg/acquire-item.cc:1193 apt-pkg/acquire-item.cc:1121
+ #, c-format
 -msgid "write, still have %lu to write but couldn't"
 -msgstr ""
 -
 -#: apt-pkg/contrib/fileutl.cc:597
 -msgid "Problem closing the file"
++msgid ""
++"The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:80
- #, c-format
- msgid "Not using locking for read only lock file %s"
 -#: apt-pkg/contrib/fileutl.cc:603
 -msgid "Problem unlinking the file"
++#: apt-pkg/acquire-item.cc:1280 apt-pkg/acquire-item.cc:1208
++msgid "Size mismatch"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:85
 -#: apt-pkg/contrib/fileutl.cc:614
 -msgid "Problem syncing the file"
++#: apt-pkg/vendorlist.cc:66
 +#, c-format
- msgid "Could not open lock file %s"
++msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:103
 -#: apt-pkg/pkgcache.cc:126
 -msgid "Empty package cache"
++#: apt-pkg/cdrom.cc:507 apt-pkg/cdrom.cc:504
 +#, c-format
- msgid "Not using locking for nfs mounted lock file %s"
++msgid ""
++"Using CD-ROM mount point %s\n"
++"Mounting CD-ROM\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:107
- #, c-format
- msgid "Could not get lock %s"
 -#: apt-pkg/pkgcache.cc:132
 -msgid "The package cache file is corrupted"
++#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 apt-pkg/cdrom.cc:513
++#: apt-pkg/cdrom.cc:595
++msgid "Identifying.. "
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:359
 -#: apt-pkg/pkgcache.cc:137
 -msgid "The package cache file is an incompatible version"
++#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:538
 +#, c-format
- msgid "Waited for %s but it wasn't there"
++msgid "Stored label: %s \n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:369
 -#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/cdrom.cc:561 apt-pkg/cdrom.cc:558
  #, c-format
- msgid "Sub-process %s received a segmentation fault."
 -msgid "This APT does not support the versioning system '%s'"
++msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:372
- #, c-format
- msgid "Sub-process %s returned an error code (%u)"
 -#: apt-pkg/pkgcache.cc:147
 -msgid "The package cache was built for a different architecture"
++#: apt-pkg/cdrom.cc:579 apt-pkg/cdrom.cc:576
++msgid "Unmounting CD-ROM\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:374
- #, c-format
- msgid "Sub-process %s exited unexpectedly"
 -#: apt-pkg/pkgcache.cc:218
 -msgid "Depends"
++#: apt-pkg/cdrom.cc:583 apt-pkg/cdrom.cc:580
++msgid "Waiting for disc...\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:418
- #, c-format
- msgid "Could not open file %s"
 -#: apt-pkg/pkgcache.cc:218
 -msgid "PreDepends"
++#. Mount the new CDROM
++#: apt-pkg/cdrom.cc:591 apt-pkg/cdrom.cc:588
++msgid "Mounting CD-ROM...\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:474
- #, c-format
- msgid "read, still have %lu to read but none left"
 -#: apt-pkg/pkgcache.cc:218
 -msgid "Suggests"
++#: apt-pkg/cdrom.cc:609 apt-pkg/cdrom.cc:606
++msgid "Scanning disc for index files..\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:504
 -#: apt-pkg/pkgcache.cc:219
 -msgid "Recommends"
++#: apt-pkg/cdrom.cc:647 apt-pkg/cdrom.cc:644
 +#, c-format
- msgid "write, still have %lu to write but couldn't"
++msgid "Found %i package indexes, %i source indexes and %i signatures\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:579
- msgid "Problem closing the file"
 -#: apt-pkg/pkgcache.cc:219
 -msgid "Conflicts"
++#: apt-pkg/cdrom.cc:704 apt-pkg/cdrom.cc:701
++msgid "That is not a valid name, try again.\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:585
- msgid "Problem unlinking the file"
 -#: apt-pkg/pkgcache.cc:219
 -msgid "Replaces"
++#: apt-pkg/cdrom.cc:720 apt-pkg/cdrom.cc:717
++#, c-format
++msgid ""
++"This disc is called: \n"
++"'%s'\n"
  msgstr ""
  
- #: apt-pkg/contrib/fileutl.cc:596
- msgid "Problem syncing the file"
 -#: apt-pkg/pkgcache.cc:220
 -msgid "Obsoletes"
++#: apt-pkg/cdrom.cc:724 apt-pkg/cdrom.cc:721
++msgid "Copying package lists..."
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:126
- msgid "Empty package cache"
 -#: apt-pkg/pkgcache.cc:231
 -msgid "important"
++#: apt-pkg/cdrom.cc:748 apt-pkg/cdrom.cc:745
++msgid "Writing new source list\n"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:132
- msgid "The package cache file is corrupted"
 -#: apt-pkg/pkgcache.cc:231
 -msgid "required"
++#: apt-pkg/cdrom.cc:757 apt-pkg/cdrom.cc:754
++msgid "Source list entries for this disc are:\n"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:137
- msgid "The package cache file is an incompatible version"
 -#: apt-pkg/pkgcache.cc:231
 -msgid "standard"
++#: apt-pkg/cdrom.cc:791 apt-pkg/cdrom.cc:788
++msgid "Unmounting CD-ROM..."
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:142
 -#: apt-pkg/pkgcache.cc:232
 -msgid "optional"
++#: apt-pkg/indexcopy.cc:261
 +#, c-format
- msgid "This APT does not support the versioning system '%s'"
- msgstr ""
- 
- #: apt-pkg/pkgcache.cc:147
- msgid "The package cache was built for a different architecture"
++msgid "Wrote %i records.\n"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:218
- msgid "Depends"
 -#: apt-pkg/pkgcache.cc:232
 -msgid "extra"
++#: apt-pkg/indexcopy.cc:263
++#, c-format
++msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:218
- msgid "PreDepends"
 -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
 -msgid "Building dependency tree"
++#: apt-pkg/indexcopy.cc:266
++#, c-format
++msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:218
- msgid "Suggests"
 -#: apt-pkg/depcache.cc:61
 -msgid "Candidate versions"
++#: apt-pkg/indexcopy.cc:269
++#, c-format
++msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:219
- msgid "Recommends"
 -#: apt-pkg/depcache.cc:90
 -msgid "Dependency generation"
++#: apt-pkg/deb/dpkgpm.cc:358
++#, c-format
++msgid "Preparing %s"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:219
- msgid "Conflicts"
 -#: apt-pkg/tagfile.cc:73
++#: apt-pkg/deb/dpkgpm.cc:359
+ #, c-format
 -msgid "Unable to parse package file %s (1)"
++msgid "Unpacking %s"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:219
- msgid "Replaces"
 -#: apt-pkg/tagfile.cc:160
++#: apt-pkg/deb/dpkgpm.cc:364
+ #, c-format
 -msgid "Unable to parse package file %s (2)"
++msgid "Preparing to configure %s"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:220
- msgid "Obsoletes"
 -#: apt-pkg/sourcelist.cc:87
++#: apt-pkg/deb/dpkgpm.cc:365
+ #, c-format
 -msgid "Malformed line %lu in source list %s (URI)"
++msgid "Configuring %s"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:231
- msgid "important"
 -#: apt-pkg/sourcelist.cc:89
++#: apt-pkg/deb/dpkgpm.cc:366
+ #, c-format
 -msgid "Malformed line %lu in source list %s (dist)"
++msgid "Installed %s"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:231
- msgid "required"
 -#: apt-pkg/sourcelist.cc:92
++#: apt-pkg/deb/dpkgpm.cc:371
+ #, c-format
 -msgid "Malformed line %lu in source list %s (URI parse)"
++msgid "Preparing for removal of %s"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:231
- msgid "standard"
 -#: apt-pkg/sourcelist.cc:98
++#: apt-pkg/deb/dpkgpm.cc:372
+ #, c-format
 -msgid "Malformed line %lu in source list %s (absolute dist)"
++msgid "Removing %s"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:232
- msgid "optional"
 -#: apt-pkg/sourcelist.cc:105
++#: apt-pkg/deb/dpkgpm.cc:373
+ #, c-format
 -msgid "Malformed line %lu in source list %s (dist parse)"
++msgid "Removed %s"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:232
- msgid "extra"
 -#: apt-pkg/sourcelist.cc:156
++#: apt-pkg/deb/dpkgpm.cc:378
+ #, c-format
 -msgid "Opening %s"
++msgid "Preparing for remove with config %s"
  msgstr ""
  
- #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
- msgid "Building dependency tree"
 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
++#: apt-pkg/deb/dpkgpm.cc:379
+ #, c-format
 -msgid "Line %u too long in source list %s."
++msgid "Removed with config %s"
  msgstr ""
  
- #: apt-pkg/depcache.cc:61
- msgid "Candidate versions"
 -#: apt-pkg/sourcelist.cc:187
++#: methods/cdrom.cc:113
+ #, c-format
 -msgid "Malformed line %u in source list %s (type)"
++msgid "Unable to read the cdrom database %s"
  msgstr ""
  
- #: apt-pkg/depcache.cc:90
- msgid "Dependency generation"
 -#: apt-pkg/sourcelist.cc:191
 -#, c-format
 -msgid "Type '%s' is not known on line %u in source list %s"
++#: methods/cdrom.cc:122
++msgid ""
++"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
++"cannot be used to add new CD-ROMs"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:73
 -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
--#, c-format
- msgid "Unable to parse package file %s (1)"
 -msgid "Malformed line %u in source list %s (vendor id)"
++#: methods/cdrom.cc:130 methods/cdrom.cc:168
++msgid "Wrong CD-ROM"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:160
 -#: apt-pkg/packagemanager.cc:402
++#: methods/cdrom.cc:163
  #, c-format
- msgid "Unable to parse package file %s (2)"
 -msgid ""
 -"This installation run will require temporarily removing the essential "
 -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 -"you really want to do it, activate the APT::Force-LoopBreak option."
++msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:87
 -#: apt-pkg/pkgrecords.cc:37
--#, c-format
- msgid "Malformed line %lu in source list %s (URI)"
 -msgid "Index file type '%s' is not supported"
++#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
++msgid "File not found"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:89
 -#: apt-pkg/algorithms.cc:241
--#, c-format
- msgid "Malformed line %lu in source list %s (dist)"
 -msgid ""
 -"The package %s needs to be reinstalled, but I can't find an archive for it."
++#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
++#: methods/gzip.cc:142
++msgid "Failed to stat"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:92
- #, c-format
- msgid "Malformed line %lu in source list %s (URI parse)"
 -#: apt-pkg/algorithms.cc:1059
 -msgid ""
 -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 -"held packages."
++#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
++msgid "Failed to set modification time"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:98
- #, c-format
- msgid "Malformed line %lu in source list %s (absolute dist)"
 -#: apt-pkg/algorithms.cc:1061
 -msgid "Unable to correct problems, you have held broken packages."
++#: methods/file.cc:42
++msgid "Invalid URI, local URIS must not start with //"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:105
 -#: apt-pkg/acquire.cc:62
--#, c-format
- msgid "Malformed line %lu in source list %s (dist parse)"
 -msgid "Lists directory %spartial is missing."
++#. Login must be before getpeername otherwise dante won't work.
++#: methods/ftp.cc:162
++msgid "Logging in"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:156
 -#: apt-pkg/acquire.cc:66
--#, c-format
- msgid "Opening %s"
 -msgid "Archive directory %spartial is missing."
++#: methods/ftp.cc:168
++msgid "Unable to determine the peer name"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:170
 -#: apt-pkg/acquire.cc:817
--#, c-format
- msgid "Line %u too long in source list %s."
 -msgid "Downloading file %li of %li (%s remaining)"
++#: methods/ftp.cc:173
++msgid "Unable to determine the local name"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:187
 -#: apt-pkg/acquire-worker.cc:112
++#: methods/ftp.cc:204 methods/ftp.cc:232
  #, c-format
- msgid "Malformed line %u in source list %s (type)"
 -msgid "The method driver %s could not be found."
++msgid "The server refused the connection and said: %s"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:191
 -#: apt-pkg/acquire-worker.cc:161
++#: methods/ftp.cc:210
  #, c-format
- msgid "Type '%s' is not known on line %u in source list %s"
 -msgid "Method %s did not start correctly"
++msgid "USER failed, server said: %s"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
 -#: apt-pkg/init.cc:119
++#: methods/ftp.cc:217
  #, c-format
- msgid "Malformed line %u in source list %s (vendor id)"
 -msgid "Packaging system '%s' is not supported"
++msgid "PASS failed, server said: %s"
  msgstr ""
  
- #: apt-pkg/packagemanager.cc:402
- #, c-format
 -#: apt-pkg/init.cc:135
 -msgid "Unable to determine a suitable packaging system type"
++#: methods/ftp.cc:237
 +msgid ""
- "This installation run will require temporarily removing the essential "
- "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
- "you really want to do it, activate the APT::Force-LoopBreak option."
++"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
++"is empty."
  msgstr ""
  
- #: apt-pkg/pkgrecords.cc:37
 -#: apt-pkg/clean.cc:61
++#: methods/ftp.cc:265
  #, c-format
- msgid "Index file type '%s' is not supported"
 -msgid "Unable to stat %s."
++msgid "Login script command '%s' failed, server said: %s"
  msgstr ""
  
- #: apt-pkg/algorithms.cc:241
 -#: apt-pkg/srcrecords.cc:48
 -msgid "You must put some 'source' URIs in your sources.list"
++#: methods/ftp.cc:291
 +#, c-format
- msgid ""
- "The package %s needs to be reinstalled, but I can't find an archive for it."
++msgid "TYPE failed, server said: %s"
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1059
- msgid ""
- "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
- "held packages."
 -#: apt-pkg/cachefile.cc:73
 -msgid "The package lists or status file could not be parsed or opened."
++#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
++msgid "Connection timeout"
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1061
- msgid "Unable to correct problems, you have held broken packages."
 -#: apt-pkg/cachefile.cc:77
 -msgid "You may want to run apt-get update to correct these problems"
++#: methods/ftp.cc:335
++msgid "Server closed the connection"
  msgstr ""
  
- #: apt-pkg/acquire.cc:61
- #, c-format
- msgid "Lists directory %spartial is missing."
 -#: apt-pkg/policy.cc:269
 -msgid "Invalid record in the preferences file, no Package header"
++#: methods/ftp.cc:345 methods/rsh.cc:197
++msgid "A response overflowed the buffer."
  msgstr ""
  
- #: apt-pkg/acquire.cc:65
 -#: apt-pkg/policy.cc:291
--#, c-format
- msgid "Archive directory %spartial is missing."
 -msgid "Did not understand pin type %s"
++#: methods/ftp.cc:362 methods/ftp.cc:374
++msgid "Protocol corruption"
  msgstr ""
  
- #: apt-pkg/acquire-worker.cc:112
- #, c-format
- msgid "The method driver %s could not be found."
 -#: apt-pkg/policy.cc:299
 -msgid "No priority (or zero) specified for pin"
++#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
++msgid "Could not create a socket"
  msgstr ""
  
- #: apt-pkg/acquire-worker.cc:161
- #, c-format
- msgid "Method %s did not start correctly"
 -#: apt-pkg/pkgcachegen.cc:74
 -msgid "Cache has an incompatible versioning system"
++#: methods/ftp.cc:698
++msgid "Could not connect data socket, connection timed out"
  msgstr ""
  
- #: apt-pkg/init.cc:119
 -#: apt-pkg/pkgcachegen.cc:117
--#, c-format
- msgid "Packaging system '%s' is not supported"
 -msgid "Error occurred while processing %s (NewPackage)"
++#: methods/ftp.cc:704
++msgid "Could not connect passive socket."
  msgstr ""
  
- #: apt-pkg/init.cc:135
- msgid "Unable to determine a suitable packaging system type"
 -#: apt-pkg/pkgcachegen.cc:129
 -#, c-format
 -msgid "Error occurred while processing %s (UsePackage1)"
++#: methods/ftp.cc:722
++msgid "getaddrinfo was unable to get a listening socket"
  msgstr ""
  
- #: apt-pkg/clean.cc:61
 -#: apt-pkg/pkgcachegen.cc:150
--#, c-format
- msgid "Unable to stat %s."
 -msgid "Error occurred while processing %s (UsePackage2)"
++#: methods/ftp.cc:736
++msgid "Could not bind a socket"
  msgstr ""
  
- #: apt-pkg/srcrecords.cc:48
- msgid "You must put some 'source' URIs in your sources.list"
 -#: apt-pkg/pkgcachegen.cc:154
 -#, c-format
 -msgid "Error occurred while processing %s (NewFileVer1)"
++#: methods/ftp.cc:740
++msgid "Could not listen on the socket"
  msgstr ""
  
- #: apt-pkg/cachefile.cc:73
- msgid "The package lists or status file could not be parsed or opened."
 -#: apt-pkg/pkgcachegen.cc:184
 -#, c-format
 -msgid "Error occurred while processing %s (NewVersion1)"
++#: methods/ftp.cc:747
++msgid "Could not determine the socket's name"
  msgstr ""
  
- #: apt-pkg/cachefile.cc:77
- msgid "You may want to run apt-get update to correct these problems"
 -#: apt-pkg/pkgcachegen.cc:188
 -#, c-format
 -msgid "Error occurred while processing %s (UsePackage3)"
++#: methods/ftp.cc:779
++msgid "Unable to send PORT command"
  msgstr ""
  
- #: apt-pkg/policy.cc:269
- msgid "Invalid record in the preferences file, no Package header"
 -#: apt-pkg/pkgcachegen.cc:192
++#: methods/ftp.cc:789
+ #, c-format
 -msgid "Error occurred while processing %s (NewVersion2)"
++msgid "Unknown address family %u (AF_*)"
  msgstr ""
  
- #: apt-pkg/policy.cc:291
 -#: apt-pkg/pkgcachegen.cc:207
 -msgid "Wow, you exceeded the number of package names this APT is capable of."
++#: methods/ftp.cc:798
 +#, c-format
- msgid "Did not understand pin type %s"
++msgid "EPRT failed, server said: %s"
  msgstr ""
  
- #: apt-pkg/policy.cc:299
- msgid "No priority (or zero) specified for pin"
 -#: apt-pkg/pkgcachegen.cc:210
 -msgid "Wow, you exceeded the number of versions this APT is capable of."
++#: methods/ftp.cc:818
++msgid "Data socket connect timed out"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:74
- msgid "Cache has an incompatible versioning system"
 -#: apt-pkg/pkgcachegen.cc:213
 -msgid "Wow, you exceeded the number of dependencies this APT is capable of."
++#: methods/ftp.cc:825
++msgid "Unable to accept connection"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:117
 -#: apt-pkg/pkgcachegen.cc:241
--#, c-format
- msgid "Error occurred while processing %s (NewPackage)"
 -msgid "Error occurred while processing %s (FindPkg)"
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
++msgid "Problem hashing file"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:129
 -#: apt-pkg/pkgcachegen.cc:254
++#: methods/ftp.cc:877
  #, c-format
- msgid "Error occurred while processing %s (UsePackage1)"
 -msgid "Error occurred while processing %s (CollectFileProvides)"
++msgid "Unable to fetch file, server said '%s'"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:150
 -#: apt-pkg/pkgcachegen.cc:260
 -#, c-format
 -msgid "Package %s %s was not found while processing file dependencies"
++#: methods/ftp.cc:892 methods/rsh.cc:322
++msgid "Data socket timed out"
+ msgstr ""
+ 
 -#: apt-pkg/pkgcachegen.cc:574
++#: methods/ftp.cc:922
  #, c-format
- msgid "Error occurred while processing %s (UsePackage2)"
 -msgid "Couldn't stat source package list %s"
++msgid "Data transfer failed, server said '%s'"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:154
 -#: apt-pkg/pkgcachegen.cc:658
 -msgid "Collecting File Provides"
++#. Get the files information
++#: methods/ftp.cc:997
++msgid "Query"
+ msgstr ""
+ 
 -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
 -msgid "IO Error saving source cache"
++#: methods/ftp.cc:1106
++msgid "Unable to invoke "
+ msgstr ""
+ 
 -#: apt-pkg/acquire-item.cc:126
++#: methods/connect.cc:64
  #, c-format
- msgid "Error occurred while processing %s (NewFileVer1)"
 -msgid "rename failed, %s (%s -> %s)."
++msgid "Connecting to %s (%s)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:184
 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
 -msgid "MD5Sum mismatch"
++#: methods/connect.cc:71
 +#, c-format
- msgid "Error occurred while processing %s (NewVersion1)"
++msgid "[IP: %s %s]"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:188
 -#: apt-pkg/acquire-item.cc:722
++#: methods/connect.cc:80
  #, c-format
- msgid "Error occurred while processing %s (UsePackage3)"
 -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)"
++msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:192
 -#: apt-pkg/acquire-item.cc:775
++#: methods/connect.cc:86
  #, c-format
- msgid "Error occurred while processing %s (NewVersion2)"
 -msgid ""
 -"I wasn't able to locate file for the %s package. This might mean you need to "
 -"manually fix this package."
++msgid "Cannot initiate the connection to %s:%s (%s)."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:207
- msgid "Wow, you exceeded the number of package names this APT is capable of."
 -#: apt-pkg/acquire-item.cc:811
++#: methods/connect.cc:92
+ #, c-format
 -msgid ""
 -"The package index files are corrupted. No Filename: field for package %s."
++msgid "Could not connect to %s:%s (%s), connection timed out"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:210
- msgid "Wow, you exceeded the number of versions this APT is capable of."
 -#: apt-pkg/acquire-item.cc:898
 -msgid "Size mismatch"
++#: methods/connect.cc:104
++#, c-format
++msgid "Could not connect to %s:%s (%s)."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:213
- msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 -#: apt-pkg/vendorlist.cc:66
++#. We say this mainly because the pause here is for the
++#. ssh connection that is still going
++#: methods/connect.cc:132 methods/rsh.cc:425
+ #, c-format
 -msgid "Vendor block %s contains no fingerprint"
++msgid "Connecting to %s"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:241
 -#: apt-pkg/cdrom.cc:507
++#: methods/connect.cc:163
  #, c-format
- msgid "Error occurred while processing %s (FindPkg)"
 -msgid ""
 -"Using CD-ROM mount point %s\n"
 -"Mounting CD-ROM\n"
++msgid "Could not resolve '%s'"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:254
 -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
 -msgid "Identifying.. "
++#: methods/connect.cc:167
 +#, c-format
- msgid "Error occurred while processing %s (CollectFileProvides)"
++msgid "Temporary failure resolving '%s'"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:260
 -#: apt-pkg/cdrom.cc:541
++#: methods/connect.cc:169
  #, c-format
- msgid "Package %s %s was not found while processing file dependencies"
 -msgid "Stored label: %s \n"
++msgid "Something wicked happened resolving '%s:%s' (%i)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:574
 -#: apt-pkg/cdrom.cc:561
++#: methods/connect.cc:216
  #, c-format
- msgid "Couldn't stat source package list %s"
 -msgid "Using CD-ROM mount point %s\n"
++msgid "Unable to connect to %s %s:"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:658
- msgid "Collecting File Provides"
 -#: apt-pkg/cdrom.cc:579
 -msgid "Unmounting CD-ROM\n"
++#: methods/gpgv.cc:92
++msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
- msgid "IO Error saving source cache"
 -#: apt-pkg/cdrom.cc:583
 -msgid "Waiting for disc...\n"
++#: methods/gpgv.cc:191
++msgid ""
++"Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:126
- #, c-format
- msgid "rename failed, %s (%s -> %s)."
 -#. Mount the new CDROM
 -#: apt-pkg/cdrom.cc:591
 -msgid "Mounting CD-ROM...\n"
++#: methods/gpgv.cc:196
++msgid "At least one invalid signature was encountered."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
- msgid "MD5Sum mismatch"
 -#: apt-pkg/cdrom.cc:609
 -msgid "Scanning disc for index files..\n"
++#. FIXME String concatenation considered harmful.
++#: methods/gpgv.cc:201
++msgid "Could not execute "
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:714
 -#: apt-pkg/cdrom.cc:647
--#, 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)"
 -msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: methods/gpgv.cc:202
++msgid " to verify signature (is gnupg installed?)"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:767
- #, c-format
- msgid ""
- "I wasn't able to locate file for the %s package. This might mean you need to "
- "manually fix this package."
 -#: apt-pkg/cdrom.cc:704
 -msgid "That is not a valid name, try again.\n"
++#: methods/gpgv.cc:206
++msgid "Unknown error executing gpgv"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:803
 -#: apt-pkg/cdrom.cc:720
--#, c-format
--msgid ""
- "The package index files are corrupted. No Filename: field for package %s."
 -"This disc is called: \n"
 -"'%s'\n"
++#: methods/gpgv.cc:237
++msgid "The following signatures were invalid:\n"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:890
- msgid "Size mismatch"
 -#: apt-pkg/cdrom.cc:724
 -msgid "Copying package lists..."
++#: methods/gpgv.cc:244
++msgid ""
++"The following signatures couldn't be verified because the public key is not "
++"available:\n"
  msgstr ""
  
- #: apt-pkg/vendorlist.cc:66
 -#: apt-pkg/cdrom.cc:748
 -msgid "Writing new source list\n"
++#: methods/gzip.cc:57
 +#, c-format
- msgid "Vendor block %s contains no fingerprint"
++msgid "Couldn't open pipe for %s"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:504
 -#: apt-pkg/cdrom.cc:757
 -msgid "Source list entries for this disc are:\n"
++#: methods/gzip.cc:102
 +#, c-format
- msgid ""
- "Using CD-ROM mount point %s\n"
- "Mounting CD-ROM\n"
++msgid "Read error from %s process"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595
- msgid "Identifying.. "
 -#: apt-pkg/cdrom.cc:791
 -msgid "Unmounting CD-ROM..."
++#: methods/http.cc:381
++msgid "Waiting for headers"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:538
 -#: apt-pkg/indexcopy.cc:261
++#: methods/http.cc:527
  #, c-format
- msgid "Stored label: %s \n"
 -msgid "Wrote %i records.\n"
++msgid "Got a single header line over %u chars"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:558
 -#: apt-pkg/indexcopy.cc:263
--#, c-format
- msgid "Using CD-ROM mount point %s\n"
 -msgid "Wrote %i records with %i missing files.\n"
++#: methods/http.cc:535
++msgid "Bad header line"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:576
- msgid "Unmounting CD-ROM\n"
 -#: apt-pkg/indexcopy.cc:266
 -#, c-format
 -msgid "Wrote %i records with %i mismatched files\n"
++#: methods/http.cc:554 methods/http.cc:561
++msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:580
- msgid "Waiting for disc...\n"
 -#: apt-pkg/indexcopy.cc:269
 -#, c-format
 -msgid "Wrote %i records with %i missing files and %i mismatched files\n"
++#: methods/http.cc:590
++msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
- #. Mount the new CDROM
- #: apt-pkg/cdrom.cc:588
- msgid "Mounting CD-ROM...\n"
 -#: apt-pkg/deb/dpkgpm.cc:358
 -#, c-format
 -msgid "Preparing %s"
++#: methods/http.cc:605
++msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:606
- msgid "Scanning disc for index files..\n"
 -#: apt-pkg/deb/dpkgpm.cc:359
 -#, c-format
 -msgid "Unpacking %s"
++#: methods/http.cc:607
++msgid "This HTTP server has broken range support"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:644
 -#: apt-pkg/deb/dpkgpm.cc:364
--#, c-format
- msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 -msgid "Preparing to configure %s"
++#: methods/http.cc:631
++msgid "Unknown date format"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:701
- msgid "That is not a valid name, try again.\n"
 -#: apt-pkg/deb/dpkgpm.cc:365
 -#, c-format
 -msgid "Configuring %s"
++#: methods/http.cc:778
++msgid "Select failed"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:717
 -#: apt-pkg/deb/dpkgpm.cc:366
--#, c-format
- msgid ""
- "This disc is called: \n"
- "'%s'\n"
 -msgid "Installed %s"
++#: methods/http.cc:783
++msgid "Connection timed out"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:721
- msgid "Copying package lists..."
 -#: apt-pkg/deb/dpkgpm.cc:371
 -#, c-format
 -msgid "Preparing for removal of %s"
++#: methods/http.cc:806
++msgid "Error writing to output file"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:745
- msgid "Writing new source list\n"
 -#: apt-pkg/deb/dpkgpm.cc:372
 -#, c-format
 -msgid "Removing %s"
++#: methods/http.cc:834
++msgid "Error writing to file"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:754
- msgid "Source list entries for this disc are:\n"
 -#: apt-pkg/deb/dpkgpm.cc:373
 -#, c-format
 -msgid "Removed %s"
++#: methods/http.cc:859
++msgid "Error writing to the file"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:788
- msgid "Unmounting CD-ROM..."
 -#: apt-pkg/deb/dpkgpm.cc:378
 -#, c-format
 -msgid "Preparing for remove with config %s"
++#: methods/http.cc:873
++msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:261
 -#: apt-pkg/deb/dpkgpm.cc:379
--#, c-format
- msgid "Wrote %i records.\n"
 -msgid "Removed with config %s"
++#: methods/http.cc:875
++msgid "Error reading from server"
 +msgstr ""
 +
- #: apt-pkg/indexcopy.cc:263
- #, c-format
- msgid "Wrote %i records with %i missing files.\n"
++#: methods/http.cc:1106
++msgid "Bad header data"
 +msgstr ""
 +
- #: apt-pkg/indexcopy.cc:266
- #, c-format
- msgid "Wrote %i records with %i mismatched files\n"
++#: methods/http.cc:1123
++msgid "Connection failed"
 +msgstr ""
 +
- #: apt-pkg/indexcopy.cc:269
- #, c-format
- msgid "Wrote %i records with %i missing files and %i mismatched files\n"
++#: methods/http.cc:1214
++msgid "Internal error"
+ msgstr ""
+ 
+ #: methods/rsh.cc:330
+ msgid "Connection closed prematurely"
  msgstr ""