From 007dc9e082687e65a7ed89fc416bab05eaa5f96f Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Wed, 19 Jan 2005 08:25:10 +0000 Subject: Merge michael.vogt@canonical.com--2004/apt--status-fd--0 Patches applied: * 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 --- po/apt-all.pot | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'po') diff --git a/po/apt-all.pot b/po/apt-all.pot index dfafb2c4f..4d0e15658 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: 2004-12-23 12:36+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 @@ 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 "" -- cgit v1.2.3