merge debian/sid into debian/experimental

[apt.git] / po / bs.po

diff --git a/po/bs.po b/po/bs.po
index 5bbec432a902f813d9dce074433a9aa7b8fa0e05..e32f2353fe90f9a8b854e0033f2663254a6fadb7 100644 (file)
--- a/po/bs.po
+++ b/po/bs.po
@@ -920,7 +920,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'
@@ -932,7 +932,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
@@ -1541,8 +1541,8 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Računam nadogradnju..."
+msgid "Calculating upgrade"
+msgstr "Računam nadogradnju"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
@@ -2375,12 +2375,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