diff options
author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-12-29 01:18:28 +0000 |
---|---|---|
committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2004-12-29 01:18:28 +0000 |
commit | 2ee99a54fd671f74b6ee24307e11ab0534580b87 (patch) | |
tree | 0e5e082135ad29f15effaa045b5da2758004e5d8 /po/apt-all.pot | |
parent | 51d13ae3354082c12f6e5dd3797c514c6de702b0 (diff) | |
parent | 32133629d8c49029f3d04886aa605de4864b486e (diff) |
Merge apt--mvo--0
Patches applied:
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-5
* added apt-key update method
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-6
* if a sign-file download fails, delete the the partial download in "partial/" also
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-7
* changelog updated, version is now 0.6.27ubuntu4; added DEB_BUILD_PROG_OPTS to debian/rules
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-8
* removed Release.gpg files in partial/ before fetching a new one
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-9
* some comments about the pkgAcqMetaSig::Custom600Headers() added
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-10
* fix permissions in po/
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-11
* use gpg --with-colons
Diffstat (limited to 'po/apt-all.pot')
-rw-r--r-- | po/apt-all.pot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/po/apt-all.pot b/po/apt-all.pot index 7d8e9d40f..dfafb2c4f 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-20 10:20+0100\n" +"POT-Creation-Date: 2004-12-23 12:36+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" @@ -2259,31 +2259,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:893 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:897 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:707 +#: apt-pkg/acquire-item.cc:711 #, 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:760 +#: apt-pkg/acquire-item.cc:764 #, 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:796 +#: apt-pkg/acquire-item.cc:800 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:883 +#: apt-pkg/acquire-item.cc:887 msgid "Size mismatch" msgstr "" |