merge debian/sid into debian/experimental

[apt.git] / po / apt-all.pot

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 3822dd9dbc6fa0d9372a3bb27a52ceb3f3a2e6e4..4e91a8e33b9e89b399768beabd22b6d103cec4c7 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -901,7 +901,7 @@ msgid "At least one invalid signature was encountered."
 msgstr ""
 
 #: methods/gpgv.cc:174
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
@@ -913,7 +913,7 @@ msgid ""
 msgstr ""
 
 #: methods/gpgv.cc:184
-msgid "Unknown error executing gpgv"
+msgid "Unknown error executing apt-key"
 msgstr ""
 
 #: methods/gpgv.cc:217 methods/gpgv.cc:224
@@ -1515,7 +1515,7 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
+msgid "Calculating upgrade"
 msgstr ""
 
 #: apt-private/private-upgrade.cc:28
@@ -2344,12 +2344,7 @@ msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:237
-#, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Unable to parse package file %s (%d)"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:78