diff options
| author | Michael Vogt <mvo@debian.org> | 2005-01-20 12:06:58 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2005-01-20 12:06:58 +0000 |
| commit | d3fbe3fe7968190312c953ee7ba0c567be33ef09 (patch) | |
| tree | d52419c9d0e79425cca4dd35ccaeba5abaa330cc /po/apt-all.pot | |
| parent | 67073e88fc4654be702fe3b176e94b86a484a858 (diff) | |
| parent | a2a5cd159fad8f9d07d31f791e89e1fdf672cdd9 (diff) | |
* 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
Diffstat (limited to 'po/apt-all.pot')
| -rw-r--r-- | po/apt-all.pot | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot index 2acd6ae34..b7062c588 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -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 <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -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 "" @@ -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 "" |