merged from the debian-sid branch

[apt.git] / po / apt-all.pot

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 051aebbf0959a1e232efea87ac689dff264980fa..9f826514baf4d30daa8bb3287eae55524ceb2548 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -251,8 +251,8 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819
-#: apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: apt-pkg/pkgcachegen.cc:827
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
@@ -358,7 +358,7 @@ msgid "Unable to open DB file %s: %s"
 msgstr ""
 
 #: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
@@ -719,7 +719,7 @@ msgid "Unable to lock the download directory"
 msgstr ""
 
 #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
-#: apt-pkg/cachefile.cc:67 apt-pkg/cachefile.cc:63
+#: apt-pkg/cachefile.cc:63 apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 
@@ -782,6 +782,7 @@ msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
 #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
+#: apt-pkg/algorithms.cc:1348
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
@@ -890,7 +891,8 @@ msgstr ""
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 apt-pkg/algorithms.cc:1374
+#: apt-pkg/algorithms.cc:1376
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -994,6 +996,7 @@ msgid "Calculating upgrade... "
 msgstr ""
 
 #: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
+#: methods/connect.cc:111
 msgid "Failed"
 msgstr ""
 
@@ -1371,11 +1374,11 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
-#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
-#: apt-pkg/contrib/configuration.cc:748 apt-pkg/contrib/cdromutl.cc:150
-#: apt-pkg/sourcelist.cc:320 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:753
+#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/contrib/configuration.cc:821 apt-pkg/acquire.cc:419
+#: methods/mirror.cc:85
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -1405,11 +1408,11 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
 #. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752
-#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
-#: apt-pkg/pkgcachegen.cc:949 apt-pkg/pkgcachegen.cc:748
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
 #: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:760
+#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
+#: apt-pkg/pkgcachegen.cc:957
 msgid "Reading package lists"
 msgstr ""
 
@@ -1537,14 +1540,12 @@ msgstr ""
 msgid "File not found"
 msgstr ""
 
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
-#: methods/copy.cc:43
+#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
+#: methods/rred.cc:234 methods/rred.cc:243
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
-#: methods/rred.cc:240 methods/copy.cc:80
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1605,7 +1606,7 @@ msgid "Server closed the connection"
 msgstr ""
 
 #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
-#: apt-pkg/contrib/fileutl.cc:469
+#: apt-pkg/contrib/fileutl.cc:538
 msgid "Read error"
 msgstr ""
 
@@ -1618,7 +1619,7 @@ msgid "Protocol corruption"
 msgstr ""
 
 #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:577
 msgid "Write error"
 msgstr ""
 
@@ -1672,8 +1673,8 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
-#: methods/http.cc:959
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/http.cc:994
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1700,95 +1701,95 @@ msgstr ""
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:64
+#: methods/connect.cc:64 methods/connect.cc:71
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr ""
 
-#: methods/connect.cc:71
+#: methods/connect.cc:71 methods/connect.cc:82
 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 
-#: methods/connect.cc:80
+#: methods/connect.cc:80 methods/connect.cc:89
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:86
+#: methods/connect.cc:86 methods/connect.cc:95
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:93
+#: methods/connect.cc:93 methods/connect.cc:103
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:108
+#: methods/connect.cc:108 methods/connect.cc:118
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425 methods/connect.cc:146
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: methods/connect.cc:167
+#: methods/connect.cc:167 methods/connect.cc:164 methods/connect.cc:183
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:173
+#: methods/connect.cc:173 methods/connect.cc:189
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:176
+#: methods/connect.cc:176 methods/connect.cc:192
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 
-#: methods/connect.cc:223
+#: methods/connect.cc:223 methods/connect.cc:239
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr ""
 
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:65 methods/gpgv.cc:71
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: methods/gpgv.cc:100
+#: methods/gpgv.cc:101 methods/gpgv.cc:107
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:204
+#: methods/gpgv.cc:205 methods/gpgv.cc:223
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:209
+#: methods/gpgv.cc:210 methods/gpgv.cc:228
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:213
+#: methods/gpgv.cc:214
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:218
+#: methods/gpgv.cc:219 methods/gpgv.cc:237
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:249
+#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:256
+#: methods/gpgv.cc:257 methods/gpgv.cc:285
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1804,292 +1805,287 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:376 methods/http.cc:377
+#: methods/http.cc:377 methods/http.cc:379
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:522 methods/http.cc:523
+#: methods/http.cc:523 methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:530 methods/http.cc:531
+#: methods/http.cc:531 methods/http.cc:533
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:549 methods/http.cc:556 methods/http.cc:550
-#: methods/http.cc:557
+#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:552
+#: methods/http.cc:559
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:585 methods/http.cc:586
+#: methods/http.cc:586 methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:600 methods/http.cc:601
+#: methods/http.cc:601 methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:602 methods/http.cc:603
+#: methods/http.cc:603 methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:626 methods/http.cc:627
+#: methods/http.cc:627 methods/http.cc:629
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:773 methods/http.cc:774
+#: methods/http.cc:774 methods/http.cc:782
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:778 methods/http.cc:779
+#: methods/http.cc:779 methods/http.cc:787
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:801 methods/http.cc:802
+#: methods/http.cc:802 methods/http.cc:810
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:832 methods/http.cc:833
+#: methods/http.cc:833 methods/http.cc:841
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:860 methods/http.cc:861
+#: methods/http.cc:861 methods/http.cc:869
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:874 methods/http.cc:875
+#: methods/http.cc:875 methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:876 methods/http.cc:877
+#: methods/http.cc:877 methods/http.cc:885
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1107 methods/http.cc:1104
+#: methods/http.cc:1104 methods/http.cc:1144
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1124 methods/http.cc:1121 methods/http.cc:1176
+#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1161
+#: methods/http.cc:1216
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1215 methods/http.cc:1228
+#: methods/http.cc:1228 methods/http.cc:1308
 msgid "Internal error"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:82 apt-pkg/contrib/mmap.cc:78
 #: apt-pkg/contrib/mmap.cc:80
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:87 apt-pkg/contrib/mmap.cc:83
 #: apt-pkg/contrib/mmap.cc:85
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:981 apt-pkg/contrib/strutl.cc:978
+#: apt-pkg/contrib/strutl.cc:978 apt-pkg/contrib/strutl.cc:1018
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:436 apt-pkg/contrib/configuration.cc:434
+#: apt-pkg/contrib/configuration.cc:439
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:494 apt-pkg/contrib/configuration.cc:492
+#: apt-pkg/contrib/configuration.cc:497
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:512
+#: apt-pkg/contrib/configuration.cc:515
 #, c-format
-msgid "Line %d too long (max %d)"
+msgid "Line %d too long (max %u)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:608 apt-pkg/contrib/configuration.cc:606
+#: apt-pkg/contrib/configuration.cc:611 apt-pkg/contrib/configuration.cc:662
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:627 apt-pkg/contrib/configuration.cc:625
+#: apt-pkg/contrib/configuration.cc:630 apt-pkg/contrib/configuration.cc:681
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:644 apt-pkg/contrib/configuration.cc:642
+#: apt-pkg/contrib/configuration.cc:647 apt-pkg/contrib/configuration.cc:698
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:684 apt-pkg/contrib/configuration.cc:682
+#: apt-pkg/contrib/configuration.cc:687 apt-pkg/contrib/configuration.cc:738
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:691 apt-pkg/contrib/configuration.cc:689
+#: apt-pkg/contrib/configuration.cc:694 apt-pkg/contrib/configuration.cc:745
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
-#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:704 apt-pkg/contrib/configuration.cc:702
+#: apt-pkg/contrib/configuration.cc:707 apt-pkg/contrib/configuration.cc:758
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738 apt-pkg/contrib/configuration.cc:736
+#: apt-pkg/contrib/configuration.cc:741 apt-pkg/contrib/configuration.cc:809
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:155 apt-pkg/contrib/progress.cc:152
 #: apt-pkg/contrib/progress.cc:153
 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:157 apt-pkg/contrib/progress.cc:154
 #: apt-pkg/contrib/progress.cc:155
 #, c-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:80 apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:77
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122 apt-pkg/contrib/cmndline.cc:103
-#: apt-pkg/contrib/cmndline.cc:111 apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:127 apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:124
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
 #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:237 apt-pkg/contrib/cmndline.cc:234
+#: apt-pkg/contrib/cmndline.cc:234
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:268 apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc:265
 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:301 apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:351 apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:55 apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:52
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
 #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:180 apt-pkg/acquire.cc:425
+#: apt-pkg/acquire.cc:450 methods/mirror.cc:91
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:190 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/contrib/cdromutl.cc:187 apt-pkg/contrib/cdromutl.cc:188
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:80
+#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:149
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:85
+#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:103
+#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:172
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:107
+#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:176
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:375
+#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:444
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:385
+#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:454
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:388
+#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:457
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:459
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:434
+#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:503
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:490
+#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:559
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:520
+#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:589
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:664
 msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:601
+#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:670
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:612
+#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:681
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -2166,97 +2162,93 @@ msgstr ""
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127 apt-pkg/depcache.cc:121
-#: apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:122
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:128 apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:151
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
-#: apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:196 apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:219
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:202 apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:225
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:106 apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:193 apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:189
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:94 apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:90
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:96 apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:92
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:99 apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:95
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:105 apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:101
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:112 apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:108
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:203 apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:199
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 apt-pkg/sourcelist.cc:216
-#: apt-pkg/cdrom.cc:448
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:240 apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:236
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:244 apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:240
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
 #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:403 apt-pkg/packagemanager.cc:399
+#: apt-pkg/packagemanager.cc:428
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2264,240 +2256,236 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:37 apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:248 apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1104 apt-pkg/algorithms.cc:1103
-#: apt-pkg/algorithms.cc:1105
+#: apt-pkg/algorithms.cc:1105 apt-pkg/algorithms.cc:1107
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1106 apt-pkg/algorithms.cc:1105
-#: apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1107 apt-pkg/algorithms.cc:1109
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/acquire.cc:62 apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:66 apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:830 apt-pkg/acquire.cc:827
+#: apt-pkg/acquire.cc:827 apt-pkg/acquire.cc:829
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:832 apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:829 apt-pkg/acquire.cc:831
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:113 apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:110
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:162 apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:159
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:384 apt-pkg/acquire-worker.cc:396
-#: apt-pkg/acquire-worker.cc:398
+#: apt-pkg/acquire-worker.cc:398 apt-pkg/acquire-worker.cc:413
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:125 apt-pkg/init.cc:124
+#: apt-pkg/init.cc:124 apt-pkg/init.cc:125
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:141 apt-pkg/init.cc:140
+#: apt-pkg/init.cc:140 apt-pkg/init.cc:141
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/clean.cc:61 apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:57
 #, c-format
 msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:48 apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:44
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:69
+#: apt-pkg/cachefile.cc:69 apt-pkg/cachefile.cc:71
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:77 apt-pkg/cachefile.cc:73
+#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:75
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/policy.cc:270 apt-pkg/policy.cc:267
+#: apt-pkg/policy.cc:267
 msgid "Invalid record in the preferences file, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:292 apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:289
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:300 apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:297
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:76 apt-pkg/pkgcachegen.cc:72
+#: apt-pkg/pkgcachegen.cc:72
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:119 apt-pkg/pkgcachegen.cc:115
+#: apt-pkg/pkgcachegen.cc:115
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:134 apt-pkg/pkgcachegen.cc:130
+#: apt-pkg/pkgcachegen.cc:130
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:157
+#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:164
 #, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:178
+#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:189
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:186 apt-pkg/pkgcachegen.cc:182
+#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:193
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:224
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:217
+#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:228
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:225 apt-pkg/pkgcachegen.cc:221
+#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:232
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:249
+#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:256
 #, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:255 apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:262
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:258 apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:254 apt-pkg/pkgcachegen.cc:265
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:261 apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:268
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:264 apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:260 apt-pkg/pkgcachegen.cc:271
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:292 apt-pkg/pkgcachegen.cc:288
+#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:299
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:305 apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:312
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:307
+#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:318
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:682 apt-pkg/pkgcachegen.cc:678
+#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:690
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:767 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:763 apt-pkg/pkgcachegen.cc:775
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
 #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:134
 #, c-format
 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:401
+#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:451
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1107 apt-pkg/acquire-item.cc:1097
-#: apt-pkg/acquire-item.cc:1100
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+#: apt-pkg/acquire-item.cc:707 apt-pkg/acquire-item.cc:1478
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1170
 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:1210
-#: apt-pkg/acquire-item.cc:1213
+#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1283
 #, 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:1269
-#: apt-pkg/acquire-item.cc:1272
+#: apt-pkg/acquire-item.cc:1272 apt-pkg/acquire-item.cc:1342
 #, 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:1310
-#: apt-pkg/acquire-item.cc:1313
+#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1383
 #, 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:1397
-#: apt-pkg/acquire-item.cc:1400
+#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1470
 msgid "Size mismatch"
 msgstr ""
 
@@ -2506,221 +2494,316 @@ msgstr ""
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:531 apt-pkg/cdrom.cc:529
+#: apt-pkg/cdrom.cc:529
 #, 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:538
-#: apt-pkg/cdrom.cc:620 apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:565 apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:563
 #, c-format
-msgid "Stored label: %s \n"
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:583 apt-pkg/cdrom.cc:590
+#: apt-pkg/cdrom.cc:590
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:603 apt-pkg/cdrom.cc:601 apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:608
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:607 apt-pkg/cdrom.cc:605 apt-pkg/cdrom.cc:612
+#: apt-pkg/cdrom.cc:612
 msgid "Waiting for disc...\n"
 msgstr ""
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615 apt-pkg/cdrom.cc:613 apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc:620
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:633 apt-pkg/cdrom.cc:631 apt-pkg/cdrom.cc:638
+#: apt-pkg/cdrom.cc:638
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:673 apt-pkg/cdrom.cc:671
+#: apt-pkg/cdrom.cc:678
 #, c-format
 msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"Found %u package indexes, %u source indexes, %u translation indexes and %u "
 "signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:710 apt-pkg/cdrom.cc:708 apt-pkg/cdrom.cc:715
+#: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:739 apt-pkg/cdrom.cc:737 apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:744
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755 apt-pkg/cdrom.cc:753 apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:760
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:759 apt-pkg/cdrom.cc:757 apt-pkg/cdrom.cc:764
+#: apt-pkg/cdrom.cc:764
 msgid "Copying package lists..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:785 apt-pkg/cdrom.cc:783 apt-pkg/cdrom.cc:790
+#: apt-pkg/cdrom.cc:790
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:794 apt-pkg/cdrom.cc:792 apt-pkg/cdrom.cc:799
+#: apt-pkg/cdrom.cc:799
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:836 apt-pkg/cdrom.cc:834 apt-pkg/cdrom.cc:570
-#: apt-pkg/cdrom.cc:841
-msgid "Unmounting CD-ROM...\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 apt-pkg/indexcopy.cc:832
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 apt-pkg/indexcopy.cc:834
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 apt-pkg/indexcopy.cc:837
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 apt-pkg/indexcopy.cc:840
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:358 apt-pkg/deb/dpkgpm.cc:522
-#: apt-pkg/deb/dpkgpm.cc:596
+#: apt-pkg/deb/dpkgpm.cc:513 apt-pkg/deb/dpkgpm.cc:532
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:621
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:359 apt-pkg/deb/dpkgpm.cc:523
-#: apt-pkg/deb/dpkgpm.cc:597
+#: apt-pkg/deb/dpkgpm.cc:597 apt-pkg/deb/dpkgpm.cc:622
 #, c-format
 msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:364 apt-pkg/deb/dpkgpm.cc:528
-#: apt-pkg/deb/dpkgpm.cc:602
+#: apt-pkg/deb/dpkgpm.cc:602 apt-pkg/deb/dpkgpm.cc:627
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:365 apt-pkg/deb/dpkgpm.cc:529
-#: apt-pkg/deb/dpkgpm.cc:603
+#: apt-pkg/deb/dpkgpm.cc:603 apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:628
 #, c-format
 msgid "Configuring %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:366 apt-pkg/deb/dpkgpm.cc:530
-#: apt-pkg/deb/dpkgpm.cc:608
+#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:630 apt-pkg/deb/dpkgpm.cc:631
+#, c-format
+msgid "Processing triggers for %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:633
 #, c-format
 msgid "Installed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:371 apt-pkg/deb/dpkgpm.cc:535
 #: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615
-#: apt-pkg/deb/dpkgpm.cc:616
+#: apt-pkg/deb/dpkgpm.cc:616 apt-pkg/deb/dpkgpm.cc:638
+#: apt-pkg/deb/dpkgpm.cc:640 apt-pkg/deb/dpkgpm.cc:641
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:372 apt-pkg/deb/dpkgpm.cc:536
-#: apt-pkg/deb/dpkgpm.cc:618
+#: apt-pkg/deb/dpkgpm.cc:618 apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:373 apt-pkg/deb/dpkgpm.cc:537
-#: apt-pkg/deb/dpkgpm.cc:619
+#: apt-pkg/deb/dpkgpm.cc:619 apt-pkg/deb/dpkgpm.cc:644
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:378 apt-pkg/deb/dpkgpm.cc:542
-#: apt-pkg/deb/dpkgpm.cc:624
+#: apt-pkg/deb/dpkgpm.cc:624 apt-pkg/deb/dpkgpm.cc:649
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:379 apt-pkg/deb/dpkgpm.cc:543
-#: apt-pkg/deb/dpkgpm.cc:625
+#: apt-pkg/deb/dpkgpm.cc:625 apt-pkg/deb/dpkgpm.cc:650
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
+#: apt-pkg/deb/dpkgpm.cc:775 apt-pkg/deb/dpkgpm.cc:805
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 #: methods/rred.cc:219
 msgid "Could not patch file"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:510
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""
+
+#: methods/gpgv.cc:232
 #, c-format
-msgid "Line %d too long (max %u)"
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr ""
+
+#: methods/http.cc:979 apt-pkg/contrib/mmap.cc:196
+msgid "Failed to truncate file"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:153
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
 #, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:245
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
 #, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
-#: apt-pkg/acquire-item.cc:1408
-msgid "Hash Sum mismatch"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:566 apt-pkg/deb/dpkgpm.cc:513
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
 #, c-format
-msgid "Directory '%s' missing"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:709
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
 #, c-format
-msgid "openpty failed\n"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/acquire-item.cc:1244
 #, c-format
-msgid "Stored label: %s\n"
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used.GPG error: %s: %s\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1253
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:40
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:678
 #, c-format
 msgid ""
-"Found %u package indexes, %u source indexes, %u translation indexes and %u "
-"signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:51
 #, c-format
-msgid "Processing triggers for %s"
+msgid "Installing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:775
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: apt-pkg/deb/dpkgpm.cc:54
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1011
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1016
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1018
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1024
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1030
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:72
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:81
+msgid ""
+"dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to "
+"correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:99
+msgid "Not locked"
+msgstr ""
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:172
+#, c-format
+msgid "No mirror file '%s' found "
 msgstr ""