diff options
| author | Michael Vogt <mvo@debian.org> | 2014-09-29 09:58:38 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-09-29 09:58:38 +0200 |
| commit | 4c333a25a88b1afac2ed50bf1b9af61dc5b09343 (patch) | |
| tree | d4b90a7bc46e9da364efb74365a0af604b38e424 /po/bs.po | |
| parent | bca84917c326fa3158e120147c8aecebe0789b47 (diff) | |
| parent | 6eb377fb9fba6b7f17f635143e9201f0d62a50fb (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/gpgv.cc
Diffstat (limited to 'po/bs.po')
| -rw-r--r-- | po/bs.po | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 @@ -1575,8 +1575,8 @@ msgid "All packages are up to date." 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" |