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/nb.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/nb.po')
| -rw-r--r-- | po/nb.po | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1017,9 +1017,9 @@ msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." #: 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 "" -"Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)" +"Klarte ikke kjøre «apt-key» for å verifisere signaturen (er gnupg installert?)" #. TRANSLATORS: %s is a single techy word like 'NODATA' #: methods/gpgv.cc:180 @@ -1030,8 +1030,8 @@ msgid "" msgstr "" #: methods/gpgv.cc:184 -msgid "Unknown error executing gpgv" -msgstr "Ukjent feil ved kjøring av gpgv" +msgid "Unknown error executing apt-key" +msgstr "Ukjent feil ved kjøring av apt-key" #: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" @@ -1706,8 +1706,8 @@ msgid "All packages are up to date." msgstr "" #: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Beregner oppgradering... " +msgid "Calculating upgrade" +msgstr "Beregner oppgradering" #: apt-private/private-upgrade.cc:28 msgid "Done" |