Build fixes for W32

1 files changed, 356 insertions, 349 deletions

diff --git a/po/nb.po b/po/nb.po
index 32286c1f8..68cf97263 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-05-08 08:46+0200\n"
+"POT-Creation-Date: 2007-06-15 10:36+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrestøl <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -18,58 +18,58 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:194
+#: agent/call-pinentry.c:198
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke å lagre fingeravtrykket: %s\n"
 
-#: agent/call-pinentry.c:424
+#: agent/call-pinentry.c:428
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:427
+#: agent/call-pinentry.c:431
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:474
+#: agent/call-pinentry.c:478
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:494 agent/call-pinentry.c:506
+#: agent/call-pinentry.c:498 agent/call-pinentry.c:510
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:495
+#: agent/call-pinentry.c:499
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:503
+#: agent/call-pinentry.c:507
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:508
+#: agent/call-pinentry.c:512
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:524
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:525
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:561
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -79,7 +79,7 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
+#: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1010 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
 #: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
@@ -88,12 +88,12 @@ msgstr "kan ikke opprette «%s»: %s\n"
 
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
-#: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
+#: g10/encode.c:506 g10/gpg.c:1011 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
-#: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/plaintext.c:505 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
-#: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1765
+#: sm/gpgsm.c:1802 sm/gpgsm.c:1840 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke åpne «%s»: %s\n"
@@ -192,13 +192,13 @@ msgstr ""
 "Du trenger en passfrase for å beskytte din hemmelige nøkkel.\n"
 "\n"
 
-#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1202
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1198
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "endre passfrasen"
 
-#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1208
-#: tools/symcryptrun.c:468
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1204
+#: tools/symcryptrun.c:458
 msgid "does not match - try again"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:113 agent/preset-passphrase.c:74 agent/protect-tool.c:111
+#: agent/gpg-agent.c:114 agent/preset-passphrase.c:74 agent/protect-tool.c:111
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -218,241 +218,241 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:115 scd/scdaemon.c:105
+#: agent/gpg-agent.c:116 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:116 scd/scdaemon.c:108
+#: agent/gpg-agent.c:117 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:117 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:118 g10/gpg.c:470 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:338 tools/gpg-connect-agent.c:60
 #: tools/gpgconf.c:69 tools/symcryptrun.c:166
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:118 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:119 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:339
 msgid "be somewhat more quiet"
 msgstr "være noenlunde stille"
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:111
+#: agent/gpg-agent.c:120 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:112
+#: agent/gpg-agent.c:121 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:121 tools/symcryptrun.c:169
+#: agent/gpg-agent.c:122 tools/symcryptrun.c:169
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra «%s»\n"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:121
+#: agent/gpg-agent.c:127 scd/scdaemon.c:121
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:127
+#: agent/gpg-agent.c:128
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:128 scd/scdaemon.c:122 sm/gpgsm.c:341
+#: agent/gpg-agent.c:129 scd/scdaemon.c:122 sm/gpgsm.c:341
 #: tools/symcryptrun.c:168
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "søke etter nøkler på en nøkkelserver"
 
-#: agent/gpg-agent.c:130
+#: agent/gpg-agent.c:131
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:137
+#: agent/gpg-agent.c:138
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdatér tillitsdatabasen etter import"
 
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:146
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:151
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:158
+#: agent/gpg-agent.c:159
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:160
+#: agent/gpg-agent.c:161
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:161
+#: agent/gpg-agent.c:162
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:163
+#: agent/gpg-agent.c:164
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:247 agent/preset-passphrase.c:96 agent/protect-tool.c:148
+#: agent/gpg-agent.c:248 agent/preset-passphrase.c:96 agent/protect-tool.c:148
 #: scd/scdaemon.c:192 sm/gpgsm.c:521 tools/gpg-connect-agent.c:126
 #: tools/gpgconf.c:91 tools/symcryptrun.c:206
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:251
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksmåte: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:253
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:303 g10/gpg.c:931 scd/scdaemon.c:247 sm/gpgsm.c:650
+#: agent/gpg-agent.c:288 g10/gpg.c:917 scd/scdaemon.c:232 sm/gpgsm.c:635
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:479 agent/protect-tool.c:1059 kbx/kbxutil.c:432
-#: scd/scdaemon.c:339 sm/gpgsm.c:771 sm/gpgsm.c:774 tools/symcryptrun.c:1037
+#: agent/gpg-agent.c:473 agent/protect-tool.c:1045 kbx/kbxutil.c:421
+#: scd/scdaemon.c:325 sm/gpgsm.c:756 sm/gpgsm.c:759 tools/symcryptrun.c:1028
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:572 g10/gpg.c:2035 scd/scdaemon.c:415 sm/gpgsm.c:865
+#: agent/gpg-agent.c:566 g10/gpg.c:2022 scd/scdaemon.c:401 sm/gpgsm.c:850
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil «%s»\n"
 
-#: agent/gpg-agent.c:577 agent/gpg-agent.c:1136 g10/gpg.c:2039
-#: scd/scdaemon.c:420 sm/gpgsm.c:869 tools/symcryptrun.c:970
+#: agent/gpg-agent.c:571 agent/gpg-agent.c:1132 g10/gpg.c:2026
+#: scd/scdaemon.c:406 sm/gpgsm.c:854 tools/symcryptrun.c:961
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil «%s»: %s\n"
 
-#: agent/gpg-agent.c:585 g10/gpg.c:2046 scd/scdaemon.c:428 sm/gpgsm.c:876
+#: agent/gpg-agent.c:579 g10/gpg.c:2033 scd/scdaemon.c:414 sm/gpgsm.c:861
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra «%s»\n"
 
-#: agent/gpg-agent.c:906 g10/plaintext.c:142 g10/plaintext.c:147
+#: agent/gpg-agent.c:902 g10/plaintext.c:142 g10/plaintext.c:147
 #: g10/plaintext.c:164
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
-#: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:428 scd/scdaemon.c:914
+#: agent/gpg-agent.c:1192 agent/gpg-agent.c:1295 agent/gpg-agent.c:1299
+#: agent/gpg-agent.c:1338 agent/gpg-agent.c:1342 g10/exec.c:174
+#: g10/openfile.c:431 scd/scdaemon.c:904
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen «%s»: %s\n"
 
-#: agent/gpg-agent.c:1210 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1206 scd/scdaemon.c:918
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1236 scd/scdaemon.c:954
+#: agent/gpg-agent.c:1232 scd/scdaemon.c:944
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette «%s»: %s\n"
 
-#: agent/gpg-agent.c:1265 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1261 scd/scdaemon.c:973
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "feil ved søking etter tillitspost i «%s»: %s\n"
 
-#: agent/gpg-agent.c:1273 scd/scdaemon.c:991
+#: agent/gpg-agent.c:1269 scd/scdaemon.c:981
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1275 scd/scdaemon.c:987
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig nøkkel til «%s»\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
+#: agent/gpg-agent.c:1303 agent/gpg-agent.c:1348 g10/openfile.c:434
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen «%s» ble opprettet\n"
 
-#: agent/gpg-agent.c:1355
+#: agent/gpg-agent.c:1354
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1359
+#: agent/gpg-agent.c:1358
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen «%s»: %s\n"
 
-#: agent/gpg-agent.c:1461
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1466
+#: agent/gpg-agent.c:1465
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483
+#: agent/gpg-agent.c:1482
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1488
+#: agent/gpg-agent.c:1487
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1584 scd/scdaemon.c:1116
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1106
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1690 scd/scdaemon.c:1183
+#: agent/gpg-agent.c:1694 scd/scdaemon.c:1173
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:1711
+#: agent/gpg-agent.c:1715
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1721 common/simple-pwquery.c:324 g10/call-agent.c:137
-#: sm/call-agent.c:144 tools/gpg-connect-agent.c:764
+#: agent/gpg-agent.c:1725 common/simple-pwquery.c:331 g10/call-agent.c:137
+#: sm/call-agent.c:148 tools/gpg-connect-agent.c:753
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1733 common/simple-pwquery.c:336 g10/call-agent.c:149
-#: sm/call-agent.c:156 tools/gpg-connect-agent.c:775
+#: agent/gpg-agent.c:1737 common/simple-pwquery.c:346 g10/call-agent.c:149
+#: sm/call-agent.c:160 tools/gpg-connect-agent.c:764
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
@@ -479,77 +479,77 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1189
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1192
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1195
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1204
+#: agent/protect-tool.c:1200
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1209 tools/symcryptrun.c:469
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:459
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:482
+#: agent/protect-tool.c:1219 tools/symcryptrun.c:473
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/protect-tool.c:1225 tools/symcryptrun.c:486
+#: agent/protect-tool.c:1222 tools/symcryptrun.c:477
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
 
-#: agent/trustlist.c:115 agent/trustlist.c:303
+#: agent/trustlist.c:133 agent/trustlist.c:321
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "feil med «%s»: %s\n"
 
-#: agent/trustlist.c:130
+#: agent/trustlist.c:148
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "valgfil «%s»: %s\n"
 
-#: agent/trustlist.c:150 agent/trustlist.c:158
+#: agent/trustlist.c:168 agent/trustlist.c:176
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:164
+#: agent/trustlist.c:182
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig nøkkel er ikke tilgjengelig"
 
-#: agent/trustlist.c:199
+#: agent/trustlist.c:217
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lesefeil ved «%s»: %s\n"
 
-#: agent/trustlist.c:225 agent/trustlist.c:232
+#: agent/trustlist.c:243 agent/trustlist.c:250
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:264
+#: agent/trustlist.c:282
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "feil ved lesing av «%s»: %s\n"
 
-#: agent/trustlist.c:365 agent/trustlist.c:404
+#: agent/trustlist.c:383 agent/trustlist.c:422
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -562,7 +562,7 @@ msgstr ""
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as store in the certificate.
-#: agent/trustlist.c:480
+#: agent/trustlist.c:498
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -572,7 +572,7 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:489
+#: agent/trustlist.c:507
 msgid "Correct"
 msgstr ""
 
@@ -584,19 +584,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:509
+#: agent/trustlist.c:527
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:515
+#: agent/trustlist.c:533
 msgid "No"
 msgstr ""
 
@@ -640,42 +640,42 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av «%s»: %s\n"
 
-#: common/http.c:1621
+#: common/http.c:1627
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "feil ved lesing av nøkkelblokk: %s\n"
 
-#: common/http.c:1665
+#: common/http.c:1671
 #, fuzzy
 msgid "host not found"
 msgstr "[Brukerid ikke funnet]"
 
-#: common/simple-pwquery.c:310
+#: common/simple-pwquery.c:317
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:368
+#: common/simple-pwquery.c:378
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:379
+#: common/simple-pwquery.c:389
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:389
+#: common/simple-pwquery.c:399
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
+#: common/simple-pwquery.c:562 common/simple-pwquery.c:658
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
+#: common/simple-pwquery.c:577 common/simple-pwquery.c:664
 msgid "problem with the agent\n"
 msgstr ""
 
-#: common/sysutils.c:88 g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:136
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
@@ -846,11 +846,11 @@ msgstr "ingen gyldig OpenPGP-data funnet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/call-agent.c:99 sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:106
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: g10/call-agent.c:160 sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:171
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1142,7 +1142,7 @@ msgstr "Ugyldig kommando  (prøv «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:168 g10/gpg.c:3880 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3857 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke åpne «%s»\n"
@@ -1694,57 +1694,57 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:890
+#: g10/gpg.c:876
 msgid "usage: gpg [options] "
 msgstr "bruksmåte: gpg [valg] "
 
-#: g10/gpg.c:1060 sm/gpgsm.c:686
+#: g10/gpg.c:1046 sm/gpgsm.c:671
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1078
+#: g10/gpg.c:1064
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen «=»-tegn i gruppedefinisjonen «%s»\n"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap på hjemmekatalogen «%s»\n"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap på konfigurasjonsfilen «%s»\n"
 
-#: g10/gpg.c:1281
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap på utvidelsen «%s»\n"
 
-#: g10/gpg.c:1287
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter på hjemmekatalogen «%s»\n"
 
-#: g10/gpg.c:1290
+#: g10/gpg.c:1276
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter på konfigurasjonsfilen «%s»\n"
 
-#: g10/gpg.c:1293
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter på utvidelsen «%s»\n"
 
-#: g10/gpg.c:1299
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap på katalogene på nivåene over hjemmekatalogen «%"
 "s»\n"
 
-#: g10/gpg.c:1302
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1752,20 +1752,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap på katalogene på nivåene over konfigurasjonsfilen "
 "«%s»\n"
 
-#: g10/gpg.c:1305
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap på katalogene på nivåene over utvidelsen «%s»\n"
 
-#: g10/gpg.c:1311
+#: g10/gpg.c:1297
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter på katalogene på nivåene over hjemmekatalogen "
 "«%s»\n"
 
-#: g10/gpg.c:1314
+#: g10/gpg.c:1300
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1773,461 +1773,456 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter på katalogene på nivåene over "
 "konfigurasjonsfilen «%s»\n"
 
-#: g10/gpg.c:1317
+#: g10/gpg.c:1303
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter på katalogene på nivåene over utvidelsen «%s»\n"
 
-#: g10/gpg.c:1460
+#: g10/gpg.c:1446
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt «%s»\n"
 
-#: g10/gpg.c:1553
+#: g10/gpg.c:1539
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1541
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1543
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1545
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1549
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1551
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1553
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1569
+#: g10/gpg.c:1555
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1571
+#: g10/gpg.c:1557
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1573
+#: g10/gpg.c:1559
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til nøkkelknippene i nøkkellister"
 
-#: g10/gpg.c:1575
+#: g10/gpg.c:1561
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1824
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1993
+#: g10/gpg.c:1980
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila «%s» ble ignorert\n"
 
-#: g10/gpg.c:2253 g10/gpg.c:2904 g10/gpg.c:2916
+#: g10/gpg.c:2240 g10/gpg.c:2881 g10/gpg.c:2893
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
-#: g10/gpg.c:2266
-#, c-format
-msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "cipherutvidelse «%s» ble ikke lastet på grunn av utrygge rettigheter\n"
-
 # Tenk litt på denne du, Trond.
-#: g10/gpg.c:2421 g10/gpg.c:2433
+#: g10/gpg.c:2398 g10/gpg.c:2410
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "«%s» er ikke en gyldig signaturutgåelse\n"
 
-#: g10/gpg.c:2515
+#: g10/gpg.c:2492
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "«%s» er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2538 g10/gpg.c:2733 g10/keyedit.c:4080
+#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4080
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse nøkkelserverens URL\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2527
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for nøkkelserver\n"
 
-#: g10/gpg.c:2553
+#: g10/gpg.c:2530
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for nøkkelserver\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2537
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2563
+#: g10/gpg.c:2540
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2547
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2573
+#: g10/gpg.c:2550
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2557
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2560
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2591
+#: g10/gpg.c:2568
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2570
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2595
+#: g10/gpg.c:2572
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2574
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2601
+#: g10/gpg.c:2578
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2603
+#: g10/gpg.c:2580
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2605
+#: g10/gpg.c:2582
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2584
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2609
+#: g10/gpg.c:2586
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2611
+#: g10/gpg.c:2588
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2613
+#: g10/gpg.c:2590
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2620
+#: g10/gpg.c:2597
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2623
+#: g10/gpg.c:2600
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2630
+#: g10/gpg.c:2607
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2804
+#: g10/gpg.c:2781
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2807
+#: g10/gpg.c:2784
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2893 sm/gpgsm.c:1236
+#: g10/gpg.c:2870 sm/gpgsm.c:1221
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2874
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2906
+#: g10/gpg.c:2883
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2909
+#: g10/gpg.c:2886
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2924
+#: g10/gpg.c:2901
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2938
+#: g10/gpg.c:2915
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:2944
+#: g10/gpg.c:2921
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:2927
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du må bruke filer (og ikke en pipe) når --pgp2 er påslått\n"
 
-#: g10/gpg.c:2963
+#: g10/gpg.c:2940
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 
-#: g10/gpg.c:3029 g10/gpg.c:3053 sm/gpgsm.c:1292
+#: g10/gpg.c:3006 g10/gpg.c:3030 sm/gpgsm.c:1277
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3035 g10/gpg.c:3059 sm/gpgsm.c:1300
+#: g10/gpg.c:3012 g10/gpg.c:3036 sm/gpgsm.c:1285
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3018
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3024
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3039
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed må være større enn 0\n"
 
-#: g10/gpg.c:3064
+#: g10/gpg.c:3041
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede må være større enn 1\n"
 
-#: g10/gpg.c:3066
+#: g10/gpg.c:3043
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth må være i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3068
+#: g10/gpg.c:3045
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; må være 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3047
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; må være 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3073
+#: g10/gpg.c:3050
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frarådet\n"
 
-#: g10/gpg.c:3077
+#: g10/gpg.c:3054
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; må være 0, 1 eller 3\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3061
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3093
+#: g10/gpg.c:3070
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3074
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3101
+#: g10/gpg.c:3078
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3134
+#: g10/gpg.c:3111
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke ennå med %s\n"
 
-#: g10/gpg.c:3181
+#: g10/gpg.c:3158
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen «%s» i %s-modus\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3163
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen «%s» i %s-modus\n"
 
-#: g10/gpg.c:3191
+#: g10/gpg.c:3168
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen «%s» i %s-modus\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3260
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke å initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3294
+#: g10/gpg.c:3271
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten å bruke offentlig nøkkelkryptering\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3292
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3322
+#: g10/gpg.c:3299
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3301
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3311
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3347
+#: g10/gpg.c:3324
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3349
+#: g10/gpg.c:3326
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3352
+#: g10/gpg.c:3329
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3370
+#: g10/gpg.c:3347
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3360
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3375
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3400
+#: g10/gpg.c:3377
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3403
+#: g10/gpg.c:3380
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3400
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3432
+#: g10/gpg.c:3409
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3457
+#: g10/gpg.c:3434
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3442
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3446
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3490
+#: g10/gpg.c:3467
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3575
+#: g10/gpg.c:3552
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til nøkkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3577
+#: g10/gpg.c:3554
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra nøkkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3556
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøkkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3590
+#: g10/gpg.c:3567
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "søk på nøkkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3600
+#: g10/gpg.c:3577
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh på nøkkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3628
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3636
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3749
+#: g10/gpg.c:3726
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme «%s»\n"
 
-#: g10/gpg.c:3866
+#: g10/gpg.c:3843
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3870
+#: g10/gpg.c:3847
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4182
+#: g10/gpg.c:4159
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4184
+#: g10/gpg.c:4161
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4217
+#: g10/gpg.c:4194
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede nøkkelserveren er ugyldig\n"
 
@@ -4944,95 +4939,95 @@ msgstr ""
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
+#: g10/misc.c:156 g10/misc.c:184 g10/misc.c:256
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:222
+#: g10/misc.c:221
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: g10/misc.c:336
+#: g10/misc.c:335
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell offentlig nøkkel-algoritme %s\n"
 
-#: g10/misc.c:351
+#: g10/misc.c:350
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
 
-#: g10/misc.c:366
+#: g10/misc.c:365
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 
-#: g10/misc.c:371
+#: g10/misc.c:370
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen «%s» er avlegs\n"
 
-#: g10/misc.c:490
+#: g10/misc.c:489
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:491 g10/sig-check.c:109
+#: g10/misc.c:490 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:725
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:730
+#: g10/misc.c:729
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:732
+#: g10/misc.c:731
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:739
+#: g10/misc.c:738
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:749
+#: g10/misc.c:748
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:752
+#: g10/misc.c:751
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:813
+#: g10/misc.c:812
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:838
+#: g10/misc.c:837
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:948
+#: g10/misc.c:947
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1123
+#: g10/misc.c:1122
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg «%s»\n"
 
-#: g10/misc.c:1148
+#: g10/misc.c:1147
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg «%s»\n"
@@ -5088,12 +5083,12 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310 g10/passphrase.c:600
+#: g10/passphrase.c:315 g10/passphrase.c:605
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovednøkkelid %s)"
 
-#: g10/passphrase.c:324
+#: g10/passphrase.c:329
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5104,24 +5099,24 @@ msgstr ""
 "«%.*s»\n"
 "%u-bit %s nøkkel, ID %s, opprettet %s%s\n"
 
-#: g10/passphrase.c:349
+#: g10/passphrase.c:354
 msgid "Repeat passphrase\n"
 msgstr "Gjenta passfrase\n"
 
-#: g10/passphrase.c:351
+#: g10/passphrase.c:356
 msgid "Enter passphrase\n"
 msgstr "Tast inn passfrase\n"
 
-#: g10/passphrase.c:375
+#: g10/passphrase.c:380
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:381 g10/passphrase.c:447
+#: g10/passphrase.c:386 g10/passphrase.c:452
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:579
+#: g10/passphrase.c:584
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5130,12 +5125,12 @@ msgstr ""
 "Du trenger en passfrase for å låse opp den hemmelige nøkkelen for\n"
 "brukeren: «%s»\n"
 
-#: g10/passphrase.c:587
+#: g10/passphrase.c:592
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s-nøkkel, ID %s, opprettet %s"
 
-#: g10/passphrase.c:596
+#: g10/passphrase.c:601
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5461,28 +5456,28 @@ msgstr "nøkkel %s: ingen brukerid\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:473
+#: g10/plaintext.c:474
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:480
+#: g10/plaintext.c:481
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:512
+#: g10/plaintext.c:513
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:550
+#: g10/plaintext.c:551
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:566
+#: g10/plaintext.c:567
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:600
+#: g10/plaintext.c:601
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke åpne «%s»: %s\n"
@@ -5736,12 +5731,12 @@ msgstr "NOTIS: signaturnøkkelen %s utgikk %s\n"
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:560
+#: g10/sig-check.c:563
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nøkkel %s: ingen undernøkkel for undernøkkelopphevingssignatur\n"
 
-#: g10/sig-check.c:587
+#: g10/sig-check.c:590
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nøkkel %s: ingen undernøkkel for undernøkkelbindingssignatur\n"
@@ -6204,17 +6199,28 @@ msgstr "kan ikke åpne «%s»: %s\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fant en feil ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:88
+#, fuzzy, c-format
+msgid "error loading `%s': %s\n"
+msgstr "feil ved lesing av «%s»: %s\n"
+
+#: jnlib/utf8conv.c:90
+#, fuzzy
+msgid ""
+"please see http://www.gnupg.org/download/iconv.html for more information\n"
+msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
+
+#: jnlib/utf8conv.c:126
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:134
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: jnlib/utf8conv.c:338 jnlib/utf8conv.c:604
+#: jnlib/utf8conv.c:394 jnlib/utf8conv.c:660
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "omdøping fra «%s» til «%s» mislyktes: %s\n"
@@ -6475,16 +6481,16 @@ msgid ""
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:664
+#: scd/scdaemon.c:654
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1012
+#: scd/scdaemon.c:1002
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1017
+#: scd/scdaemon.c:1007
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -6690,7 +6696,7 @@ msgstr ""
 msgid "[Error - invalid DN]"
 msgstr "Feil: ugyldig respons.\n"
 
-#: sm/certdump.c:930
+#: sm/certdump.c:938
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7020,39 +7026,39 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:621
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksmåte: gpg [valg] "
 
-#: sm/gpgsm.c:702
+#: sm/gpgsm.c:687
 #, fuzzy, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke opprette «%s»: %s\n"
 
-#: sm/gpgsm.c:1253
+#: sm/gpgsm.c:1238
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1332
+#: sm/gpgsm.c:1317
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1350
+#: sm/gpgsm.c:1335
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere «%s»: %s\n"
 
-#: sm/gpgsm.c:1542
+#: sm/gpgsm.c:1527
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1606
+#: sm/gpgsm.c:1591
 msgid "key generation is not available from the commandline\n"
 msgstr ""
 
-#: sm/gpgsm.c:1607
+#: sm/gpgsm.c:1592
 #, fuzzy, c-format
 msgid "please use the script \"%s\" to generate a new key\n"
 msgstr "Vennligst velg hvilken type nøkkel du vil generere:\n"
@@ -7076,7 +7082,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/import.c:543 tools/gpg-connect-agent.c:388
+#: sm/import.c:543 tools/gpg-connect-agent.c:377
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "feil ved lesing av «%s»: %s\n"
@@ -7149,7 +7155,7 @@ msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 msgid "invalid country code in `%s', line %d\n"
 msgstr ""
 
-#: sm/qualified.c:224
+#: sm/qualified.c:227
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7160,13 +7166,13 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:233
+#: sm/qualified.c:236
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:321
+#: sm/qualified.c:329
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7239,127 +7245,127 @@ msgid ""
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:328
+#: tools/gpg-connect-agent.c:317
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:337
+#: tools/gpg-connect-agent.c:326
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:384
 #, fuzzy
 msgid "line too long - skipped\n"
 msgstr "for lang linje"
 
-#: tools/gpg-connect-agent.c:399
+#: tools/gpg-connect-agent.c:388
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:471
+#: tools/gpg-connect-agent.c:460
 #, fuzzy, c-format
 msgid "unknown command `%s'\n"
 msgstr "ukjent valg «%s»\n"
 
-#: tools/gpg-connect-agent.c:479
+#: tools/gpg-connect-agent.c:468
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:487
+#: tools/gpg-connect-agent.c:476
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:797
+#: tools/gpg-connect-agent.c:786
 #, fuzzy, c-format
 msgid "error sending %s command: %s\n"
 msgstr "feil ved lesing av «%s»: %s\n"
 
-#: tools/gpg-connect-agent.c:806
+#: tools/gpg-connect-agent.c:795
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil ved søking etter tillitspost i «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:445 tools/gpgconf-comp.c:525 tools/gpgconf-comp.c:592
-#: tools/gpgconf-comp.c:648 tools/gpgconf-comp.c:723
+#: tools/gpgconf-comp.c:447 tools/gpgconf-comp.c:527 tools/gpgconf-comp.c:594
+#: tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:725
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:458 tools/gpgconf-comp.c:538 tools/gpgconf-comp.c:605
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:746
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:540 tools/gpgconf-comp.c:607
+#: tools/gpgconf-comp.c:663 tools/gpgconf-comp.c:748
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:563 tools/gpgconf-comp.c:612
-#: tools/gpgconf-comp.c:674 tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:470 tools/gpgconf-comp.c:565 tools/gpgconf-comp.c:614
+#: tools/gpgconf-comp.c:676 tools/gpgconf-comp.c:755
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:568 tools/gpgconf-comp.c:617
-#: tools/gpgconf-comp.c:679 tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:475 tools/gpgconf-comp.c:570 tools/gpgconf-comp.c:619
+#: tools/gpgconf-comp.c:681 tools/gpgconf-comp.c:763
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:573 tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:483 tools/gpgconf-comp.c:575 tools/gpgconf-comp.c:689
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:488
+#: tools/gpgconf-comp.c:490
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:492
+#: tools/gpgconf-comp.c:494
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:496
+#: tools/gpgconf-comp.c:498
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:506
+#: tools/gpgconf-comp.c:508
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:625
+#: tools/gpgconf-comp.c:627
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:630
+#: tools/gpgconf-comp.c:632
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:671
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:692
+#: tools/gpgconf-comp.c:694
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:738
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:772
+#: tools/gpgconf-comp.c:774
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:782
+#: tools/gpgconf-comp.c:784
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:793
+#: tools/gpgconf-comp.c:795
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:798
+#: tools/gpgconf-comp.c:800
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:835
+#: tools/gpgconf-comp.c:837
 msgid "Configuration for OCSP"
 msgstr ""
 
@@ -7399,21 +7405,21 @@ msgid ""
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:183 tools/gpgconf.c:216
+#: tools/gpgconf.c:170 tools/gpgconf.c:203
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "bruksmåte: gpg [valg] "
 
-#: tools/gpgconf.c:185
+#: tools/gpgconf.c:172
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:194
+#: tools/gpgconf.c:181
 #, fuzzy
 msgid "Component not found"
 msgstr "fant ikke offentlig nøkkel"
 
-#: tools/gpgconf.c:218
+#: tools/gpgconf.c:205
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Admin-kommandoer er ikke tillatt\n"
@@ -7472,119 +7478,119 @@ msgid ""
 "Call a simple symmetric encryption tool\n"
 msgstr ""
 
-#: tools/symcryptrun.c:294
+#: tools/symcryptrun.c:281
 #, fuzzy, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: tools/symcryptrun.c:301
+#: tools/symcryptrun.c:288
 #, fuzzy, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: tools/symcryptrun.c:327
+#: tools/symcryptrun.c:314
 #, fuzzy, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen «%s»: %s\n"
 
-#: tools/symcryptrun.c:367 tools/symcryptrun.c:384
+#: tools/symcryptrun.c:354 tools/symcryptrun.c:371
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:395
+#: tools/symcryptrun.c:382
 #, fuzzy, c-format
 msgid "error writing to %s: %s\n"
 msgstr "feil ved skriving av nøkkelknippet «%s»: %s\n"
 
-#: tools/symcryptrun.c:402
+#: tools/symcryptrun.c:389
 #, fuzzy, c-format
 msgid "error reading from %s: %s\n"
 msgstr "feil ved lesing av «%s»: %s\n"
 
-#: tools/symcryptrun.c:409 tools/symcryptrun.c:416
+#: tools/symcryptrun.c:396 tools/symcryptrun.c:403
 #, fuzzy, c-format
 msgid "error closing %s: %s\n"
 msgstr "feil med «%s»: %s\n"
 
-#: tools/symcryptrun.c:526
+#: tools/symcryptrun.c:517
 #, fuzzy
 msgid "no --program option provided\n"
 msgstr "fjernutføring av programmer er ikke støttet\n"
 
-#: tools/symcryptrun.c:532
+#: tools/symcryptrun.c:523
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr ""
 
-#: tools/symcryptrun.c:538
+#: tools/symcryptrun.c:529
 msgid "no --keyfile option provided\n"
 msgstr ""
 
-#: tools/symcryptrun.c:549
+#: tools/symcryptrun.c:540
 msgid "cannot allocate args vector\n"
 msgstr ""
 
-#: tools/symcryptrun.c:567
+#: tools/symcryptrun.c:558
 #, fuzzy, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kan ikke opprette «%s»: %s\n"
 
-#: tools/symcryptrun.c:574
+#: tools/symcryptrun.c:565
 #, fuzzy, c-format
 msgid "could not create pty: %s\n"
 msgstr "kan ikke opprette «%s»: %s\n"
 
-#: tools/symcryptrun.c:590
+#: tools/symcryptrun.c:581
 #, c-format
 msgid "could not fork: %s\n"
 msgstr ""
 
-#: tools/symcryptrun.c:618
+#: tools/symcryptrun.c:609
 #, fuzzy, c-format
 msgid "execv failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:647
+#: tools/symcryptrun.c:638
 #, fuzzy, c-format
 msgid "select failed: %s\n"
 msgstr "sleting av nøkkelblokk mislyktes: %s\n"
 
-#: tools/symcryptrun.c:664
+#: tools/symcryptrun.c:655
 #, fuzzy, c-format
 msgid "read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:716
+#: tools/symcryptrun.c:707
 #, fuzzy, c-format
 msgid "pty read failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:768
+#: tools/symcryptrun.c:759
 #, fuzzy, c-format
 msgid "waitpid failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: tools/symcryptrun.c:782
+#: tools/symcryptrun.c:773
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr ""
 
-#: tools/symcryptrun.c:837
+#: tools/symcryptrun.c:828
 #, fuzzy, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil «%s»: %s\n"
 
-#: tools/symcryptrun.c:850
+#: tools/symcryptrun.c:841
 #, fuzzy, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil «%s»: %s\n"
 
-#: tools/symcryptrun.c:1025
+#: tools/symcryptrun.c:1016
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr ""
 
-#: tools/symcryptrun.c:1045
+#: tools/symcryptrun.c:1043
 msgid "no class provided\n"
 msgstr ""
 
@@ -7593,6 +7599,10 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "ikke støttet"
 
+#~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+#~ msgstr ""
+#~ "cipherutvidelse «%s» ble ikke lastet på grunn av utrygge rettigheter\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
 
@@ -7859,9 +7869,6 @@ msgstr "ikke støttet"
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "ADVARSEL: bruker usikkert minne!\n"
 
-#~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
-#~ msgstr "vennligst se http://www.gnupg.org/faq.html for mere informasjon\n"
-
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "operasjonen er ikke mulig uten initialisert sikkert minne\n"