summaryrefslogtreecommitdiff
path: root/po/apt-all.pot
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-04-10 08:44:52 +0000
committerChristian Perrier <bubulle@debian.org>2005-04-10 08:44:52 +0000
commitb0df1de1a426b65a4c0cdcc81d00d83792620f2b (patch)
tree27252f763b64bf472c003d9cb53e997032dcd69e /po/apt-all.pot
parenta1f950b7f503003077441e313178153c17a1a3f2 (diff)
parentea8704883049f180ca1c5607f1de0118b7d86c60 (diff)
Merge with Matt
Patches applied: * apt@packages.debian.org/apt--main--0--patch-77 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-78 Update changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-14 * changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days now * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-15 * merged with matts tree * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-16 * changelog updated * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-17 * whitespace change to add incomplete log for last patch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-18 * honor "Acquire::gpgv::Options" in apt-cdrom too * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-19 * corrected a incorrect use of string().c_str() (thanks to mdz!)
Diffstat (limited to 'po/apt-all.pot')
-rw-r--r--po/apt-all.pot10
1 files changed, 5 insertions, 5 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot
index f0dfad50a..311c47fdc 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -2251,31 +2251,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, 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:761
+#: apt-pkg/acquire-item.cc:767
#, 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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr ""