From: Michael Vogt Date: Thu, 20 Jan 2005 12:06:58 +0000 (+0000) Subject: * starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc X-Git-Tag: 0.7.24ubuntu1~354^2~4 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d3fbe3fe7968190312c953ee7ba0c567be33ef09?hp=-c * starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc Patches applied: * apt@packages.debian.org/apt--main--0--patch-49 Merge michael.vogt@canonical.com--2004/apt--status-fd--0 * apt@packages.debian.org/apt--main--0--patch-50 Increment libapt-pkg version * apt@packages.debian.org/apt--main--0--patch-51 0.6.30 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-32 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-1 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-2 * changed version of the library * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-3 * merged with matt again * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4 * merged with apt--main--0 and fixed permissions in po/ * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-1 tag of michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-2 * merged with matt's tree * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-3 * removed a stupid "<<<" merge in the changelog * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-4 * star-merged with apt@packages.debian.org/apt--main--0 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-5 * removed the "pre-fork/post-fork" change and put it into it's own branch, star-merged with matt so that it applies cleanly * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-6 * cleaned a incorrect log-file merge * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-7 * removed a conflict in =tagging-method * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-8 * cleaned up the delta so that it no longer contains unreleated whitespace changes --- d3fbe3fe7968190312c953ee7ba0c567be33ef09 diff --combined po/apt-all.pot index 2acd6ae34,4d0e15658..b7062c588 --- 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-01-11 12:39+0100\n" + "POT-Creation-Date: 2004-12-20 10:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -1495,7 -1495,7 +1495,7 @@@ msgstr " msgid "Server closed the connection" msgstr "" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452 + #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 msgid "Read error" msgstr "" @@@ -1561,7 -1561,7 +1561,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:951 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1584,7 -1584,7 +1584,7 @@@ msgstr " msgid "Query" msgstr "" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1107 msgid "Unable to invoke " msgstr "" @@@ -1655,76 -1655,76 +1655,76 @@@ msgstr " msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:379 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:490 +#: methods/http.cc:525 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:533 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:552 methods/http.cc:559 msgid "The http server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:588 msgid "The http server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:603 msgid "The http server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:605 msgid "This http server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:629 msgid "Unknown date format" msgstr "" -#: methods/http.cc:737 +#: methods/http.cc:772 msgid "Select failed" msgstr "" -#: methods/http.cc:742 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "" -#: methods/http.cc:765 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:793 +#: methods/http.cc:828 msgid "Error writing to file" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:853 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:867 msgid "Error reading from server Remote end closed connection" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:869 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1065 +#: methods/http.cc:1100 msgid "Bad header Data" msgstr "" -#: methods/http.cc:1082 +#: methods/http.cc:1117 msgid "Connection failed" msgstr "" -#: methods/http.cc:1173 +#: methods/http.cc:1208 msgid "Internal error" msgstr "" @@@ -1895,54 -1895,54 +1895,54 @@@ msgstr " msgid "Could not get lock %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:358 + #: apt-pkg/contrib/fileutl.cc:359 #, c-format msgid "Waited, for %s but it wasn't there" msgstr "" - #: apt-pkg/contrib/fileutl.cc:368 + #: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" - #: apt-pkg/contrib/fileutl.cc:371 + #: apt-pkg/contrib/fileutl.cc:372 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" - #: apt-pkg/contrib/fileutl.cc:373 + #: apt-pkg/contrib/fileutl.cc:374 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" - #: apt-pkg/contrib/fileutl.cc:417 + #: apt-pkg/contrib/fileutl.cc:418 #, c-format msgid "Could not open file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:473 + #: apt-pkg/contrib/fileutl.cc:474 #, c-format msgid "read, still have %lu to read but none left" msgstr "" - #: apt-pkg/contrib/fileutl.cc:491 + #: apt-pkg/contrib/fileutl.cc:492 msgid "Write error" msgstr "" - #: apt-pkg/contrib/fileutl.cc:503 + #: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" - #: apt-pkg/contrib/fileutl.cc:578 + #: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:584 + #: apt-pkg/contrib/fileutl.cc:585 msgid "Problem unlinking the file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:595 + #: apt-pkg/contrib/fileutl.cc:596 msgid "Problem syncing the file" msgstr "" @@@ -2259,31 -2259,31 +2259,31 @@@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:897 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:711 +#: apt-pkg/acquire-item.cc:718 #, 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:764 +#: apt-pkg/acquire-item.cc:771 #, 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:800 +#: apt-pkg/acquire-item.cc:807 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:887 +#: apt-pkg/acquire-item.cc:894 msgid "Size mismatch" msgstr ""