merged from the debian-sid branch

1 files changed, 26 insertions, 26 deletions

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 55f35cafa..9f826514b 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -1674,7 +1674,7 @@ msgid "Unable to accept connection"
 msgstr ""
 
 #: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
-#: methods/http.cc:993
+#: methods/http.cc:994
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1805,78 +1805,78 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:377 methods/http.cc:378
+#: methods/http.cc:377 methods/http.cc:379
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:523 methods/http.cc:524
+#: methods/http.cc:523 methods/http.cc:525
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:531 methods/http.cc:532
+#: methods/http.cc:531 methods/http.cc:533
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551
-#: methods/http.cc:558
+#: 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:586 methods/http.cc:587
+#: methods/http.cc:586 methods/http.cc:588
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:601 methods/http.cc:602
+#: methods/http.cc:601 methods/http.cc:603
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:603 methods/http.cc:604
+#: methods/http.cc:603 methods/http.cc:605
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:627 methods/http.cc:628
+#: methods/http.cc:627 methods/http.cc:629
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:774 methods/http.cc:781
+#: methods/http.cc:774 methods/http.cc:782
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:779 methods/http.cc:786
+#: methods/http.cc:779 methods/http.cc:787
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:802 methods/http.cc:809
+#: methods/http.cc:802 methods/http.cc:810
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:833 methods/http.cc:840
+#: methods/http.cc:833 methods/http.cc:841
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:861 methods/http.cc:868
+#: methods/http.cc:861 methods/http.cc:869
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:875 methods/http.cc:882
+#: methods/http.cc:875 methods/http.cc:883
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:877 methods/http.cc:884
+#: methods/http.cc:877 methods/http.cc:885
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1104 methods/http.cc:1143
+#: methods/http.cc:1104 methods/http.cc:1144
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160
-#: methods/http.cc:1215
+#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1161
+#: methods/http.cc:1216
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1228 methods/http.cc:1307
+#: methods/http.cc:1228 methods/http.cc:1308
 msgid "Internal error"
 msgstr ""
 
@@ -2673,7 +2673,7 @@ msgstr ""
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:979 apt-pkg/contrib/mmap.cc:196
 msgid "Failed to truncate file"
 msgstr ""
 
@@ -2779,25 +2779,25 @@ msgid ""
 "error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:70
+#: 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:73
+#: 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:82
+#: 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:100
+#: apt-pkg/deb/debsystem.cc:99
 msgid "Not locked"
 msgstr ""