[Pkg-gnupg-commit] [gnupg2] 06/15: Update PO files

David Prévot taffit at moszumanska.debian.org
Sun Nov 23 21:30:30 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch patch-queue/l10n
in repository gnupg2.

commit 539fb39f234247258e4335619b9cdc4f807255af
Author: David Prévot <taffit at debian.org>
Date:   Thu Nov 13 19:26:18 2014 -0400

    Update PO files
    
    The 0001-warn-about-but-don-t-fail-on-scdaemon-options-in-gpg.patch
    patch adds two new strings, many strings lines also changed, thus the
    noise in the comments.
---
 po/be.po          | 407 +++++++++++++++++++++++++-------------------------
 po/ca.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/cs.po          | 406 +++++++++++++++++++++++++-------------------------
 po/da.po          | 408 +++++++++++++++++++++++++-------------------------
 po/de.po          | 403 ++++++++++++++++++++++++++------------------------
 po/el.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/en at boldquot.po | 415 ++++++++++++++++++++++++++-------------------------
 po/en at quot.po     | 403 ++++++++++++++++++++++++++------------------------
 po/eo.po          | 409 +++++++++++++++++++++++++-------------------------
 po/es.po          | 434 ++++++++++++++++++++++++++----------------------------
 po/et.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/fi.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/fr.po          | 409 +++++++++++++++++++++++++-------------------------
 po/gl.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/hu.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/id.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/it.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/ja.po          | 405 ++++++++++++++++++++++++++------------------------
 po/nb.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/pl.po          | 407 +++++++++++++++++++++++++-------------------------
 po/pt.po          | 409 +++++++++++++++++++++++++-------------------------
 po/pt_BR.po       | 409 +++++++++++++++++++++++++-------------------------
 po/ro.po          | 412 +++++++++++++++++++++++++--------------------------
 po/ru.po          | 427 ++++++++++++++++++++++++++---------------------------
 po/sk.po          | 410 ++++++++++++++++++++++++++-------------------------
 po/sv.po          | 429 ++++++++++++++++++++++++++---------------------------
 po/tr.po          | 427 ++++++++++++++++++++++++++---------------------------
 po/uk.po          | 408 +++++++++++++++++++++++++-------------------------
 po/zh_CN.po       | 412 +++++++++++++++++++++++++--------------------------
 po/zh_TW.po       | 409 +++++++++++++++++++++++++-------------------------
 30 files changed, 6218 insertions(+), 6130 deletions(-)

diff --git a/po/be.po b/po/be.po
index 9922128..7f06bbb 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab at mail.by>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -112,7 +112,7 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -122,7 +122,7 @@ msgstr ""
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -364,7 +364,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -458,7 +458,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -476,7 +476,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -488,18 +488,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
@@ -632,7 +632,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -641,7 +641,7 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1663,7 +1663,7 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
@@ -1963,168 +1963,168 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "дрэнны пароль"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr ""
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
@@ -2160,16 +2160,12 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2179,7 +2175,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2187,552 +2183,552 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -3983,12 +3979,12 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr ""
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr ""
 
@@ -4043,7 +4039,7 @@ msgstr ""
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr ""
 
@@ -5300,26 +5296,37 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr ""
+
+#: g10/misc.c:863
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -6413,7 +6420,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -6428,45 +6435,45 @@ msgstr ""
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 6d48b94..359d403 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
 "Language-Team: Catalan <ca at dodds.net>\n"
@@ -134,7 +134,7 @@ msgstr "la contrasenya és errònia"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -144,7 +144,7 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -390,7 +390,7 @@ msgid "run in server mode (foreground)"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -477,7 +477,6 @@ msgstr "error en la creació de la contrasenya: %s\n"
 # uncompressed so we know the gender. jm
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "no és suportat"
 
@@ -486,7 +485,6 @@ msgstr "no és suportat"
 # uncompressed so we know the gender. jm
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "no és suportat"
 
@@ -498,7 +496,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -516,7 +514,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -528,18 +526,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
@@ -674,7 +672,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -683,7 +681,7 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1756,7 +1754,7 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
@@ -2086,174 +2084,174 @@ msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
@@ -2292,16 +2290,12 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2316,7 +2310,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2324,571 +2318,571 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -4254,13 +4248,13 @@ msgstr ""
 "correcta a no ser que torneu a executar el programa.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4326,7 +4320,7 @@ msgstr "S'han esborrat %d signatures.\n"
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "invàlida"
 
@@ -5669,10 +5663,21 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:910
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -5680,22 +5685,22 @@ msgstr "No comprimit"
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
@@ -6462,7 +6467,6 @@ msgstr "NOTA: aquesta clau ha estat revocada!"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
@@ -6894,7 +6898,7 @@ msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
@@ -6913,46 +6917,46 @@ msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
diff --git a/po/cs.po b/po/cs.po
index 25daab1..e9ccece 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg2 2.0.21\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2013-09-01 11:14+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
 "Language-Team: Czech <translations.cs at gnupg.cz>\n"
@@ -133,7 +133,7 @@ msgstr "Heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -143,7 +143,7 @@ msgstr "nemohu vytvořit „%s“: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -395,7 +395,7 @@ msgstr "běžet v režimu démona (na pozadí)"
 msgid "run in server mode (foreground)"
 msgstr "běžet v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -487,7 +487,7 @@ msgstr "|SOUBOR|zapsat nastavení prostředí též do SOUBORU"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -507,7 +507,7 @@ msgstr ""
 "Syntaxe: gpg-agent [VOLBY] [PŘÍKAZ [ARGUMENTY]]\n"
 "Správa tajných klíčů pro GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
@@ -519,18 +519,18 @@ msgstr "zadána neplatná úroveň ladění „%s“\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s je příliš stará (potřebuji %s, mám %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZNÁMKA: neexistuje implicitní soubor s možnostmi „%s“\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s možnostmi „%s“: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "čtu možnosti z „%s“\n"
@@ -663,7 +663,7 @@ msgstr ""
 "Syntaxe: gpg-preset-passphrase [VOLBY] KEYGRIP\n"
 "Správa dočasné paměti pro hesla\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -672,7 +672,7 @@ msgstr ""
 "@Příkazy:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1666,7 +1666,7 @@ msgstr "Neplatný příkaz (zkuste „help“)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento příkaz není platný\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otevřít „%s“\n"
@@ -1970,163 +1970,163 @@ msgstr "používám podklíč %s místo primárního klíče %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klíč %s: tajný klíč bez klíče veřejného – přeskočeno\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "vytvořit podpis"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "vytvořit podpis v čitelném dokumentu"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "vytvořit podpis oddělený od dokumentu"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "šifrovat data"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "šifrování pouze se symetrickou šifrou"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dešifrovat data (implicitně)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "vypsat seznam klíčů"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "vypsat seznam klíčů a podpisů"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy klíčů"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam klíčů a otisků"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "vypsat seznam tajných klíčů"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "vytvořit nový pár klíčů"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "vytvořit revokační certifikát"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "odstranit klíč ze souboru veřejných klíčů"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klíč ze souboru tajných klíčů"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "podepsat klíč"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "podepsat klíč lokálně"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klíč"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "změnit heslo"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exportovat klíče"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportovat klíče na server klíčů"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importovat klíče ze serveru klíčů"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "vyhledat klíče na serveru klíčů"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat všechny klíče ze serveru klíčů"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importovat/sloučit klíče"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "změnit data na kartě"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "změnit PIN karty"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "aktualizovat databázi důvěry"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "vypsat hash zprávy"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "vytvoř výstup zakódovaný pomocí ASCII"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ID_UŽIVATELE|použít toto ID_UŽIVATELE pro podepsání nebo dešifrování"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "použít kanonický textový mód"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|SOUBOR|zapsat výstup do SOUBORU"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "neprovádět žádné změny"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "vyžádat potvrzení před přepsáním"
 
@@ -2160,11 +2160,11 @@ msgstr ""
 " --list-keys [jména]        vypsat klíče\n"
 " --fingerprint [jména]      vypsat otisky\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Použití: gpg [možnosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2174,7 +2174,7 @@ msgstr ""
 "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2182,78 +2182,78 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Veřejný klíč: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Šifra: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "užití: gpg [možnosti]"
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "konfliktní příkazy\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny „%s“\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví domovského adresáře není nastaveno bezpečně „%s“\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví konfiguračního souboru není nastaveno bezpečně „%s“\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví rozšiřujícího modulu není nastaveno bezpečně „%s“\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROVÁNÍ: přístupová práva pro domovský adresáře nejsou bezpečná „%s“\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVÁNÍ: přístupová práva pro konfigurační soubor nejsou bezpečná „%s“\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVÁNÍ: přístupová práva rozšiřujícímu modulu nejsou bezpečná „%s“\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví adresáře s domovským adresářem není nastaveno "
 "nebezpečně „%s“\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2261,21 +2261,21 @@ msgstr ""
 "VAROVÁNÍ: vlastnictví adresáře s konfiguračním souborem není nastaveno "
 "nebezpečně „%s“\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROVÁNÍ: vlastnictví adresáře s rozšiřujícím modulem není nastaveno "
 "nebezpečně „%s“\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVÁNÍ: přístupová práva k adresáři s domovským adresářem nejsou nastavena "
 "bezpečně „%s“\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2283,7 +2283,7 @@ msgstr ""
 "VAROVÁNÍ: přístupová práva k adresáři s konfiguračním souborem nejsou "
 "nastavena bezpečně „%s“\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -2291,459 +2291,459 @@ msgstr ""
 "nastavena bezpečně „%s“\n"
 
 # c-format
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "neznámá konfigurační položka „%s“\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "zobrazovat ID fotografií během výpisu klíčů"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "ukazovat URL politik během výpisu podpisů"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "ukazovat všechny poznámky během výpisu podpisů"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "ukazovat URL upřednostňovaného serveru klíčů při výpisu podpisů"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při výpisu klíčů"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "ukazovat odvolané a prošlé podklíče při výpisu klíčů"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "ukazovat název souboru s klíči při výpisu klíčů"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZNÁMKA: starý implicitní soubor s možnostmi „%s“ ignorován\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt je příliš stará (potřebuji %s, mám %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZNÁMKA: %s není pro normální použití!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klíčů\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "ukazovat URL upřednostňovaného serveru klíčů při ověřování podpisu"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při ověřování podpisů"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "ukazovat jen primární ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "ověřovat podpisy s daty PKA"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVÁNÍ: %s přepíše %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpečnou pamětí vzhledem k %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v módu --pgp2 můžete vytvářet pouze oddělené podpisy nebo podpisy čitelné "
 "jako text\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v módu --pgp2 nelze současně šifrovat a podepisovat\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v módu --pgp2 musíte použít soubor (ne rouru).\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "šifrování zpráv v módu --pgp2 vyžaduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "položka completes-needed musí být větší než 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "položka marginals-needed musí být větší než 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "položka max-cert-depth musí být v rozmezí od 1 do 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatná implicitní úroveň certifikace (default-cert-level); musí být 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZNÁMKA: jednoduchý mód S2K (0) je důrazně nedoporučován\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funkční s %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "použití šifrovacího algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "použití hashovacího algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "použití komprimačního algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVÁNÍ: specifikován adresát (-r) bez použití šifrování s veřejným klíčem\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [jméno souboru]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jméno souboru]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jméno souboru]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze použít --symmetric --encrypt v módu %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [jméno souboru]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --sign --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze použít --symmetric --sign --encrypt v módu %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jméno souboru]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jméno souboru]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jméno souboru]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key id uživatele"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id uživatele"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id uživatele [příkazy]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <id-uživatele>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdařilo: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klíče se nepodařil: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[jméno souboru]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Začněte psát svou zprávu ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifikační politiku je neplatné\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
 
@@ -2938,7 +2938,6 @@ msgstr "klíč %s: chybí identifikátor uživatele\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "přeskočen „%s“: %s\n"
 
@@ -3070,7 +3069,6 @@ msgstr "klíč %s: „%s“ beze změn\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "tajný klíč „%s“ nenalezen: %s\n"
 
@@ -4015,12 +4013,12 @@ msgstr ""
 "být nutně správné, dokud znova nespustíte program.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "revokován"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "platnost skončila"
 
@@ -4079,7 +4077,7 @@ msgstr "Smazáno %d podpisů.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "neplatný"
 
@@ -5377,26 +5375,37 @@ msgstr "%s:%u: zastaralý parametr „%s“ – neúčinkuje\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROVÁNÍ: „%s“ je zastaralý parametr – neúčinkuje\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: zastaralý parametr „%s“ – neúčinkuje\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "VAROVÁNÍ: „%s“ je zastaralý parametr – neúčinkuje\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Nezkomprimováno"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "nezkomprimováno|nic"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpráva nemusí být s %s použitelná\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednoznačné volby „%s“\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "neznámá volba „%s“\n"
@@ -6120,7 +6129,6 @@ msgstr "POZNÁMKA: podpisový klíč %s byl odvolán\n"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "podpis %s, hashovací algoritmus %s\n"
 
@@ -6537,7 +6545,7 @@ msgstr "absolutní"
 msgid "no need for a trustdb check\n"
 msgstr "není nutné kontrolovat databázi důvěry\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "další kontrola databáze důvěry v %s\n"
@@ -6552,39 +6560,39 @@ msgstr "není nutné kontrolovat databázi důvěry s modelem „%s“\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "není nutné aktualizovat databázi důvěry s modelem „%s“\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "veřejný klíč %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "prosím proveďte --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "kontroluji databázi důvěry\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracováno %d klíčů (%d validit vymazáno)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "veřejný klíč k absolutně důvěryhodnému klíči %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "požadováno %d částečné důvěry a %d úplné důvěry, model %s\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6592,7 +6600,7 @@ msgstr ""
 "hloubka: %d  platných: %3d  podepsaných: %3d  důvěra: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat záznam v databázi důvěry: chyba při zápisu: %s\n"
diff --git a/po/da.po b/po/da.po
index 23af05d..1b02a57 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2012-11-01 20:27+0200\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -124,7 +124,7 @@ msgstr "Adgangsfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -134,7 +134,7 @@ msgstr "kan ikke oprette »%s«: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -379,7 +379,7 @@ msgstr "kør i dæmontilstand (baggrunden)"
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -449,7 +449,6 @@ msgstr "brug ikke PIN-mellemlageret når der underskrives"
 
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "tillad klienter at markere nøgler som »trusted« (troværdige)"
 
@@ -459,7 +458,6 @@ msgstr "tillad forhåndsindstilling af adgangsfrase"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktiver ssh-agent-emulering"
 
@@ -475,7 +473,7 @@ msgstr "|FIL|skriv også miljøindstillinger til FIL"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -493,7 +491,7 @@ msgstr ""
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
@@ -505,18 +503,18 @@ msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (kræver %s, har %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "tilvalgsfil »%s«: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "læser tilvalg fra »%s«\n"
@@ -649,7 +647,7 @@ msgstr ""
 "Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
 "Adgangskode for mellemlagervedligeholdelse\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -658,7 +656,7 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1654,7 +1652,7 @@ msgstr "Ugyldig kommando (prøv »help«)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke åbne »%s«\n"
@@ -1960,163 +1958,163 @@ msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nøgle %s: hemmelig nøgle uden offentlig nøgle - udeladt\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "opret en underskrift"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "opret en underskrift i klartekst"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "opret en separat underskrift"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "krypter kun med symmetrisk chiffer"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "afkrypter data (standard)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "godkend en underskrift"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "vis nøgler og underskrifter"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "vis nøgler og fingeraftryk"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "fjern nøgler fra den offentlige nøglering"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøgler fra den hemmelige nøglering"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "underskriv eller rediger en nøgle"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "ændr en adgangsfrase"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "eksporter nøgler"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "eksporter nøgler til en nøgletjener"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importer nøgler fra en nøgleserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "søg efter nøgler på en nøgleserver"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "opdater alle nøgler fra en nøgleserver"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importer/sammenføj nøgler"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "udskriv kortstatus"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "ændr data på et kort"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "ændr et korts PIN"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "opdater troværdighedsdatabasen"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "vis beskedsammendrag"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "kør i servertilstand"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "opret ascii-pansrede uddata"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|krypter for BRUGER-ID"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "brug kanonisk teksttilstand"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv resultat til FIL"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "spørg før overskrivning"
 
@@ -2152,12 +2150,12 @@ msgstr ""
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
 # Skal alt dette oversættes eller er det tilvalgene?
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2167,7 +2165,7 @@ msgstr ""
 "Sign, check, encrypt eller decrypt\n"
 "standardhandling afhænger af inddata\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2175,549 +2173,549 @@ msgstr ""
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [tilvalg] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "kommandoer er i konflikt\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab af hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab på udvidelse »%s«\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på udvidelse »%s«\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på udvidelse »%s«\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ADVARSEL: Usikre indelukkede mapperettigheder på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mapperettigheder på udvidelse »%s«\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt konfigurationspunkt »%s«\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "vis billed-id'er under nøglevisninger"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "vil politikadresser under underskriftvisninger"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "vis alle notationer under underskriftvisninger"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotationer under underskriftvisninger"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brugerangivne notationer under underskriftvisninger"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i nøglevisninger"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "vis nøgleringsnavnet i nøglevisninger"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "vis udløbsdatoer under underskriftvisninger"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BEMÆRK: Gammel standardfil for tilvalg »%s« blev ignoreret\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt er for gammel (kræver %s, har %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BEMÆRK: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "»%s« er ikke et gyldigt tegnsæt\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke fortolke nøgleserveradresse\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importindstillinger\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "ugyldige importindstillinger\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "vis billed-id'er under underskriftverificering"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "vis politikadresser under underskriftverificering"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "vis alle notationer under underskriftverificering"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotationer under underskriftverificering"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "vis brugerangivne notationer under underskriftverificering"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "vis bruger-id-validitet under underskriftverificering"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "vis kun den primære bruger-id i underskriftverificering"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "valider underskrifter med PKA-data"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke angive kørselssti til %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: program kan oprette en kernefil!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overskriver %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "vil ikke køre med usikker hukommelse på grund af %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan kun lave frakoblede eller rydde underskrifter i tilstanden --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke underskrive og kryptere på samme tid i tilstanden --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "du skal bruge filer (og ikke en datakanal) når du arbejder med --pgp2 "
 "aktiveret\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering af en besked i tilstanden --pgp2 kræver IDEA-chifret\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt chifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed skal være større end 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed skal være større end 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth skal være i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldigt default-cert-level; skal være 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldigt min-cert-level; skal være 1, 2 eller 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BEMÆRK: simpel S2K-tilstand (0) frarådes på det skarpeste\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-tilstand; skal være 0, 1 eller 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "ugyldige standardpræferencer\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldige præferencer for personlig chiffer\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldige præferencer for personlig sammendrag\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldige præferencer for personlig komprimering\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker endnu ikke med %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du må ikke bruge sammendragsalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du må ikke bruge komprimeringsalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: modtagere (-r) angivet uden brug af offentlig nøglekryptering\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering af »%s« mislykkedes: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan ikke bruge --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruge --symmetric --encrypt i tilstanden %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan ikke bruge --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruge --symmetric --sign --encrypt i tilstanden %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <bruger-id>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nøgleserver send mislykkedes: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nøgleserver modtag mislykkedes: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nøgleserver søg mislykkedes: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "nøgleserver opdater mislykkedes: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme »%s«\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Gå til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
 
@@ -2913,7 +2911,6 @@ msgstr "nøgle %s: ingen bruger-id\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "udelod »%s«: %s\n"
 
@@ -3043,7 +3040,6 @@ msgstr "nøgle %s: »%s« ikke ændret\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
 
@@ -4000,12 +3996,12 @@ msgstr ""
 "korrekt med mindre du genstarter programmet.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "tilbagekaldt"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "udløbet"
 
@@ -4065,7 +4061,7 @@ msgstr "Slettede %d underskrifter.\n"
 msgid "Nothing deleted.\n"
 msgstr "Intet slettet.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "ugyldig"
 
@@ -5363,26 +5359,37 @@ msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Ukomprimeret"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "ukomprimeret|ingen"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "denne besked kan nok ikke bruges af %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydigt tilvalg »%s«\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
@@ -6115,7 +6122,6 @@ msgstr "BEMÆRK: underskriftnøgle %s er blevet tilbagekaldt\n"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s underskrift, sammendragsalgoritme %s\n"
 
@@ -6529,7 +6535,7 @@ msgstr "ultimativ"
 msgid "no need for a trustdb check\n"
 msgstr "intet behov for kontrol af trustdb\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "næste kontrol af trustdb sker den %s\n"
@@ -6545,39 +6551,39 @@ msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "intet behov for en opdatering af trustdb med troværdighedsmodellen »%s«\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "udfør venligst en --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nøgler behandlet (%d validiteter ryddet)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "ingen ultimativ troværdige nøgler fundet\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "offentlig nøgle for ultimativ troværdig nøgle %s blev ikke fundet\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginaler krævet, %d færdiggjorte krævet, %s troværdighedsmodel\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6585,7 +6591,7 @@ msgstr ""
 "dybde: %d  gyldig: %3d  underskrevet: %3d  troværdighed: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
diff --git a/po/de.po b/po/de.po
index cab9f3f..0673399 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.18\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2014-06-24 11:13+0200\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: German <de at li.org>\n"
@@ -117,7 +117,7 @@ msgstr "Passphrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -127,7 +127,7 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -380,7 +380,7 @@ msgstr "Im Daemon Modus ausführen"
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -472,7 +472,7 @@ msgstr "|DATEI|Schreibe die Umgebungsvariablen auf DATEI"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -492,7 +492,7 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
@@ -504,18 +504,18 @@ msgstr "ungültige Debugebene `%s' angegeben\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
@@ -648,7 +648,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
 "Kennwortpuffer-Pflege\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -657,7 +657,7 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1665,7 +1665,7 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
@@ -1984,163 +1984,163 @@ msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel ohne öffentlichen Schlüssel - übersprungen\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "Eine Signatur erzeugen"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "Eine Klartextsignatur erzeugen"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Signatur erzeugen"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "Signieren oder bearbeiten eines Schlüssels"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "Die Passphrase ändern"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "Hashwerte für die Dateien ausgeben"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|Verschlüsseln für USER-ID"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|DATEI|Ausgabe auf DATEI schreiben"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "vor Überschreiben nachfragen"
 
@@ -2177,11 +2177,11 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2191,7 +2191,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2199,73 +2199,73 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2273,20 +2273,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2294,477 +2294,477 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "Zeige Richtlinien-URL während des listens der Signaturen"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "Zeige IETF-Standard"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "Zeige Benutzer-Notationen während des listens der Signaturen"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "Die Bibliothek \"libgcrypt\" ist zu alt (benötigt wird %s, vorhanden ist "
 "%s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "Foto-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der Signaturprüfung "
 "anzeigen"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "Zeige widerrufene und verfallene User-IDs während der Signaturprüfung"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Haupt-User-ID während der Signaturprüfung"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "Werte das Vertrauen zu Signaturen durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextsignaturen machen\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig signieren und verschlüsseln\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
 "verwenden.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüsseln einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd User-ID"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -4061,12 +4061,12 @@ msgstr ""
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "widerrufen"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "verfallen"
 
@@ -4127,7 +4127,7 @@ msgstr "%d Beglaubigungen entfernt.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "ungültig"
 
@@ -5444,26 +5444,37 @@ msgstr "%s:%u: Die Option \"%s\" is veraltet - sie hat keine Wirkung\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNUNG: \"%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: Die Option \"%s\" is veraltet - sie hat keine Wirkung\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "WARNUNG: \"%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -6637,7 +6648,7 @@ msgstr "uneingeschränkt"
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
@@ -6652,41 +6663,41 @@ msgstr "\"Trust-DB\"-Überprüfung ist beim `%s'-Vertrauensmodell nicht nötig\n
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchführen\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
 # translated by wk
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "keine uneingeschränkt vertrauenswürdigen Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "öff. Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6694,7 +6705,7 @@ msgstr ""
 "Tiefe: %d  gültig: %3d  signiert: %3d  Vertrauen: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 6ffd890..382a7a2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -115,7 +115,7 @@ msgstr "
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -125,7 +125,7 @@ msgstr "
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -367,7 +367,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -451,13 +451,11 @@ msgstr "
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "��� �������������"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "��� �������������"
 
@@ -469,7 +467,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -487,7 +485,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -499,18 +497,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
@@ -645,7 +643,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -654,7 +652,7 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1704,7 +1702,7 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
@@ -2030,172 +2028,172 @@ msgstr "
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
@@ -2231,16 +2229,12 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2250,7 +2244,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2258,573 +2252,573 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -4168,13 +4162,13 @@ msgstr ""
 "����� ��� ��� �������������� �� ���������.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4234,7 +4228,7 @@ msgstr "
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
@@ -5572,27 +5566,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "����������"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -6345,7 +6350,6 @@ msgstr "
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
@@ -6768,7 +6772,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
@@ -6783,46 +6787,46 @@ msgstr "
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
diff --git a/po/en at boldquot.po b/po/en at boldquot.po
index 0a191f9..1ed1cf8 100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.0.26\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2014-08-12 20:30+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -137,7 +137,7 @@ msgstr "Passphrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -147,7 +147,7 @@ msgstr "can't create ‘%s’: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -392,7 +392,7 @@ msgstr "run in daemon mode (background)"
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -484,7 +484,7 @@ msgstr "|FILE|write environment settings also to FILE"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -502,7 +502,7 @@ msgstr ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
@@ -514,18 +514,18 @@ msgstr "invalid debug-level ‘%s’ given\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: no default option file ‘%s’\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "option file ‘%s’: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "reading options from ‘%s’\n"
@@ -658,7 +658,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -667,7 +667,7 @@ msgstr ""
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1659,7 +1659,7 @@ msgstr "Invalid command  (try “help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "can't open ‘%s’\n"
@@ -1960,163 +1960,163 @@ msgstr "using subkey %s instead of primary key %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "key %s: secret key without public key - skipped\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "export keys to a key server"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "import keys from a key server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "search for keys on a key server"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
@@ -2152,11 +2152,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Usage: gpg [options] [files] (-h for help)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2166,7 +2166,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2174,551 +2174,551 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "usage: gpg [options] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
-"WARNING: unsafe enclosing directory ownership on configuration file ‘%s"
-"[0m’\n"
+"WARNING: unsafe enclosing directory ownership on configuration file ‘"
+"%s’\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
-"WARNING: unsafe enclosing directory permissions on configuration file ‘%s"
-"[0m’\n"
+"WARNING: unsafe enclosing directory permissions on configuration file ‘"
+"%s’\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: old default options file ‘%s’ ignored\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt is too old (need %s, have %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s is not for normal use!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "validate signatures with PKA data"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "elevate the trust of signatures with valid PKA data"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "will not run with insecure memory due to %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filename]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filename]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <user-id>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
 
@@ -3442,8 +3442,8 @@ msgid ""
 msgstr ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
-"to the person named above?  If you don't know what to answer, enter “0"
-"[0m”.\n"
+"to the person named above?  If you don't know what to answer, enter "
+"“0”.\n"
 
 #: g10/keyedit.c:920
 #, c-format
@@ -3981,12 +3981,12 @@ msgstr ""
 "unless you restart the program.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "revoked"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "expired"
 
@@ -4046,7 +4046,7 @@ msgstr "Deleted %d signatures.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "invalid"
 
@@ -5332,26 +5332,37 @@ msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: “%s” is an obsolete option - it has no effect\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "WARNING: “%s” is an obsolete option - it has no effect\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "this message may not be usable by %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "unknown option ‘%s’\n"
@@ -6469,7 +6480,7 @@ msgstr "ultimate"
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
@@ -6484,46 +6495,46 @@ msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d keys processed (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
diff --git a/po/en at quot.po b/po/en at quot.po
index 8614b66..4d071a5 100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.0.26\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2014-08-12 20:30+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -134,7 +134,7 @@ msgstr "Passphrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -144,7 +144,7 @@ msgstr "can't create ‘%s’: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -389,7 +389,7 @@ msgstr "run in daemon mode (background)"
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -481,7 +481,7 @@ msgstr "|FILE|write environment settings also to FILE"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -499,7 +499,7 @@ msgstr ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
@@ -511,18 +511,18 @@ msgstr "invalid debug-level ‘%s’ given\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: no default option file ‘%s’\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "option file ‘%s’: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "reading options from ‘%s’\n"
@@ -655,7 +655,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -664,7 +664,7 @@ msgstr ""
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1655,7 +1655,7 @@ msgstr "Invalid command  (try “help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "can't open ‘%s’\n"
@@ -1956,163 +1956,163 @@ msgstr "using subkey %s instead of primary key %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "key %s: secret key without public key - skipped\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "export keys to a key server"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "import keys from a key server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "search for keys on a key server"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
@@ -2148,11 +2148,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Usage: gpg [options] [files] (-h for help)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2162,7 +2162,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2170,546 +2170,546 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "usage: gpg [options] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: old default options file ‘%s’ ignored\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt is too old (need %s, have %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s is not for normal use!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "validate signatures with PKA data"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "elevate the trust of signatures with valid PKA data"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "will not run with insecure memory due to %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filename]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filename]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <user-id>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
 
@@ -3970,12 +3970,12 @@ msgstr ""
 "unless you restart the program.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "revoked"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "expired"
 
@@ -4035,7 +4035,7 @@ msgstr "Deleted %d signatures.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "invalid"
 
@@ -5321,26 +5321,37 @@ msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: “%s” is an obsolete option - it has no effect\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "WARNING: “%s” is an obsolete option - it has no effect\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "this message may not be usable by %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "unknown option ‘%s’\n"
@@ -6458,7 +6469,7 @@ msgstr "ultimate"
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
@@ -6473,46 +6484,46 @@ msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d keys processed (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
diff --git a/po/eo.po b/po/eo.po
index 8998917..28d111e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -115,7 +115,7 @@ msgstr "malbona pasfrazo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -125,7 +125,7 @@ msgstr "ne povas krei '%s': %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -368,7 +368,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -451,13 +451,11 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ne realigita"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "ne realigita"
 
@@ -469,7 +467,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -487,7 +485,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -499,18 +497,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
@@ -645,7 +643,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -654,7 +652,7 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1711,7 +1709,7 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
@@ -2018,172 +2016,172 @@ msgstr "uzas flankan 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr ""
 
@@ -2219,16 +2217,12 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2238,7 +2232,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2246,570 +2240,570 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -4152,13 +4146,13 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
@@ -4217,7 +4211,7 @@ msgstr "Forvi
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "nevalida"
 
@@ -5547,28 +5541,39 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/misc.c:924
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -6719,7 +6724,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@ -6734,46 +6739,46 @@ msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
diff --git a/po/es.po b/po/es.po
index ad3821c..3d1ca80 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2013-04-24 09:47+0200\n"
 "Last-Translator: Jaime Su�rez <jaime.suma at gmail.com>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -131,7 +131,7 @@ msgstr "Frase contrase
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -141,7 +141,7 @@ msgstr "no se puede crear %s: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -200,7 +200,6 @@ msgstr ""
 
 #: agent/command-ssh.c:2514
 #, fuzzy, c-format
-#| msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Por favor introduzca la frase contrase�a para la clave ssh%0A %c"
 
@@ -210,9 +209,6 @@ msgstr "Por favor vuelva a introducir frase contrase
 
 #: agent/command-ssh.c:2858
 #, fuzzy, c-format
-#| msgid ""
-#| "Please enter a passphrase to protect the received secret key%%0A   %s"
-#| "%%0Awithin gpg-agent's key storage"
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
@@ -254,7 +250,6 @@ msgstr "C
 
 #: agent/divert-scd.c:238
 #, fuzzy, c-format
-#| msgid "%s%%0A%%0AUse the reader's keypad for input."
 msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgstr "%s%%0A%%0AUse el teclado del lector como entrada."
 
@@ -368,7 +363,6 @@ msgstr "S
 
 #: agent/genkey.c:308
 #, fuzzy, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Por favor introduzca frase contrase�a para%0Aproteger su nueva clave"
 
@@ -393,7 +387,7 @@ msgstr "ejecutar en modo demonio (segundo plano)"
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -463,7 +457,6 @@ msgstr "no usar el cach
 
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "permitir que los clientes marquen claves como \"fiables\""
 
@@ -473,13 +466,11 @@ msgstr "permitir preestablecer frase contrase
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "permitir emulaci�n de ssh-agent"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "no disponible"
 
@@ -491,7 +482,7 @@ msgstr "|FICHERO|escribir variables de entorno tambi
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -509,7 +500,7 @@ msgstr ""
 "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
@@ -521,18 +512,18 @@ msgstr "el nivel de depuraci
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
@@ -670,7 +661,7 @@ msgstr ""
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -679,7 +670,7 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1683,7 +1674,7 @@ msgstr "Orden inv
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
@@ -1989,163 +1980,163 @@ msgstr "usando subclave %s en vez de clave primaria %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "crea una firma"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "crea una firma en texto claro"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "cambia una frase contrase�a"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "imprime res�menes de mensaje"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ID-USUARIO|cifra para ID-USUARIO"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 desactiva)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FICHERO|volcar salida en FICHERO"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
@@ -2185,16 +2176,12 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2204,7 +2191,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2212,71 +2199,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2284,18 +2271,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2303,442 +2290,442 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de pol�tica al listar firmas"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones est�ndar IETF al listar firmas"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es una fecha de caducidad v�lida\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de pol�tica al verificar firmas"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "validar firmas con datos PKA"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <id-usuario>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2746,19 +2733,19 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2955,7 +2942,6 @@ msgstr "clave %s: sin identificador de usuario\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "omitido \"%s\": %s\n"
 
@@ -3085,7 +3071,6 @@ msgstr "clave %s: \"%s\" sin cambios\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
@@ -4029,12 +4014,12 @@ msgstr ""
 "correcta a menos de que reinicie el programa.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "revocada"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "caducada"
 
@@ -4093,7 +4078,7 @@ msgstr "%d firmas borradas\n"
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "inv�lida"
 
@@ -5393,26 +5378,37 @@ msgstr "%s:%u: opci
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
@@ -6145,7 +6141,6 @@ msgstr "NOTA: la clave de firmado %s ha sido revocada\n"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
@@ -6555,7 +6550,7 @@ msgstr "absoluta"
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
@@ -6574,41 +6569,41 @@ msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo `%s'\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave p�blica %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
 "modelo de confianza %s\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6616,7 +6611,7 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6781,9 +6776,6 @@ msgstr "Uso: kbxutil [opciones] [ficheros] (-h para ayuda)"
 
 #: kbx/kbxutil.c:120
 #, fuzzy
-#| msgid ""
-#| "Syntax: kbxutil [options] [files]\n"
-#| "list, export, import Keybox data\n"
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
@@ -6971,13 +6963,11 @@ msgstr "|N|Nuevo PIN"
 
 #: scd/app-openpgp.c:2257
 #, fuzzy
-#| msgid "|A|Please enter the Admin PIN"
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Por favor introduzca PIN de Administrador"
 
 #: scd/app-openpgp.c:2258
 #, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Por favor introduzca PIN"
 
@@ -7063,7 +7053,6 @@ msgstr "no se puede acceder a %s - 
 
 #: scd/app-dinsig.c:299
 #, fuzzy
-#| msgid "||Please enter your PIN at the reader's keypad"
 msgid "||Please enter your PIN at the reader's pinpad"
 msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
 
@@ -7108,7 +7097,6 @@ msgstr "|N|desconectar la tarjeta despu
 
 #: scd/scdaemon.c:144
 #, fuzzy
-#| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "no usa el teclado del lector"
 
@@ -7466,25 +7454,21 @@ msgstr "error obteniendo informaci
 
 #: sm/certlist.c:142
 #, fuzzy
-#| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "el certificado no deber�a haberse usado para certificar\n"
 
 #: sm/certlist.c:154
 #, fuzzy
-#| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "el certificado no deber�a haberse usado para firma en respuesta OCSP\n"
 
 #: sm/certlist.c:165
 #, fuzzy
-#| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "el certificado no deber�a haberse usado para cifrar\n"
 
 #: sm/certlist.c:166
 #, fuzzy
-#| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "el certificado no deber�a haberse usado para firmar\n"
 
@@ -7838,10 +7822,6 @@ msgstr "Uso: gpgsm [opciones] [ficheros] (-h para ayuda)"
 
 #: sm/gpgsm.c:525
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpgsm [options] [files]\n"
-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
diff --git a/po/et.po b/po/et.po
index e163a34..36f0725 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -113,7 +113,7 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -123,7 +123,7 @@ msgstr "`%s' ei 
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -365,7 +365,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -448,13 +448,11 @@ msgstr "viga parooli loomisel: %s\n"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei ole toetatud"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei ole toetatud"
 
@@ -466,7 +464,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -484,7 +482,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -496,18 +494,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
@@ -642,7 +640,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -651,7 +649,7 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1700,7 +1698,7 @@ msgstr "Vigane k
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
@@ -2019,172 +2017,172 @@ msgstr "kasutan sekundaarset v
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
@@ -2220,16 +2218,12 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2239,7 +2233,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2247,562 +2241,562 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -4134,13 +4128,13 @@ msgstr ""
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4200,7 +4194,7 @@ msgstr "Kustutatud %d allkirja.\n"
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
@@ -5513,27 +5507,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -6270,7 +6275,6 @@ msgstr "M
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
@@ -6688,7 +6692,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
@@ -6703,45 +6707,45 @@ msgstr "trustdb kontrolliks puudub vajadus\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 3a4ece7..2cdbde1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -129,7 +129,7 @@ msgstr "väärä salasana"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -139,7 +139,7 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -381,7 +381,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -464,13 +464,11 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei tuettu"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei tuettu"
 
@@ -482,7 +480,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -501,7 +499,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -513,18 +511,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -659,7 +657,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -668,7 +666,7 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1719,7 +1717,7 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -2038,172 +2036,172 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
@@ -2239,16 +2237,12 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2258,7 +2252,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2266,563 +2260,563 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -4160,13 +4154,13 @@ msgstr ""
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4226,7 +4220,7 @@ msgstr "%d allekirjoitusta poistettu.\n"
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
@@ -5558,27 +5552,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -6328,7 +6333,6 @@ msgstr "HUOM: avain on mitätöity!"
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
@@ -6752,7 +6756,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
@@ -6767,45 +6771,45 @@ msgstr "trustdb:n tarkistusta ei tarvita\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
diff --git a/po/fr.po b/po/fr.po
index ed95a49..5762832 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.19\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2013-04-24 09:34+0200\n"
 "Last-Translator: David Prévot <david at tilapin.org>\n"
 "Language-Team: French <traduc at traduc.org>\n"
@@ -115,7 +115,7 @@ msgstr "Phrase de passe"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -125,7 +125,7 @@ msgstr "impossible de créer « %s » : %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -377,7 +377,7 @@ msgstr "exécuter en mode démon (arrière-plan)"
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -447,7 +447,6 @@ msgstr "ne pas utiliser le cache de code pour signer"
 
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "permettre de marquer la confiance des clefs"
 
@@ -457,13 +456,11 @@ msgstr "permettre de préconfigurer la phrase de passe"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "activer l'émulation de ssh-agent"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "non pris en charge"
 
@@ -476,7 +473,7 @@ msgstr "|FICHIER|écrire aussi les réglages d'env. dans FICHIER"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -496,7 +493,7 @@ msgstr ""
 "Syntaxe : gpg-agent [options] [commande [arguments]]\n"
 "Gestionnaire de clefs secrètes pour GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "niveau de débogage « %s » incorrect\n"
@@ -508,18 +505,18 @@ msgstr "niveau de débogage « %s » incorrect\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options « %s » : %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lecture des options de « %s »\n"
@@ -656,7 +653,7 @@ msgstr ""
 "Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
 "Maintenance du cache des mots de passe\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -665,7 +662,7 @@ msgstr ""
 "@Commandes :\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1673,7 +1670,7 @@ msgstr "Commande incorrecte (essayez « help »)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir « %s »\n"
@@ -1993,163 +1990,163 @@ msgstr ""
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clef %s : clef secrète sans clef publique — ignorée\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "faire une signature"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "faire une signature en texte clair"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "afficher les clefs"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "afficher les clefs et les signatures"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "afficher et vérifier les signatures de clefs"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "afficher les clefs et les empreintes"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "afficher les clefs secrètes"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clefs"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "supprimer les clefs du porte-clefs public"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "supprimer les clefs du porte-clefs secret"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "signer une clef"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "signer une clef localement"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clef"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "modifier une phrase de passe"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exporter les clefs"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exporter les clefs vers un serveur de clefs"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importer les clefs d'un serveur de clefs"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "chercher les clefs avec un serveur de clefs"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "mettre à jour les clefs depuis un serveur"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importer ou fusionner les clefs"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "afficher l'état de la carte"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "modifier les données d'une carte"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "modifier le code personnel d'une carte"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "indiquer les fonctions de hachage"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "exécuter en mode serveur"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "créer une sortie ASCII avec armure"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|IDENTITÉ|chiffrer pour l'IDENTITÉ"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|IDENTITÉ|utiliser l'IDENTITÉ pour signer ou déchiffrer"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FICHIER|Écrire la sortie dans le FICHIER"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ne rien modifier"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "demander avant d'écraser un fichier"
 
@@ -2186,11 +2183,11 @@ msgstr ""
 " --list-keys [noms]         montrer les clefs\n"
 " --fingerprint [noms]       montrer les empreintes\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation : gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2200,7 +2197,7 @@ msgstr ""
 "Signer, vérifier, chiffrer ou déchiffrer\n"
 "L'opération par défaut dépend des données entrées\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2208,85 +2205,85 @@ msgstr ""
 "\n"
 "Algorithmes pris en charge :\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Clef publique : "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Chiffrement : "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hachage : "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compression : "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "utilisation : gpg [options] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouvé dans la définition du groupe « %s »\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire personnel « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "Attention : le propriétaire du fichier de configuration « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "Attention : le propriétaire de l'extension « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "Attention : les droits du répertoire personnel « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "Attention : les droits du fichier de configuration « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "Attention : les droits de l'extension « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire contenant le répertoire personnel\n"
 "            « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2294,21 +2291,21 @@ msgstr ""
 "Attention : le propriétaire du répertoire contenant le fichier de\n"
 "            configuration « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire contenant l'extension\n"
 "            « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "Attention : les droits du répertoire contenant le répertoire personnel\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2316,471 +2313,471 @@ msgstr ""
 "Attention : les droits du répertoire contenant le fichier de configuration\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "Attention : les droits du répertoire contenant l'extension\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "élément de configuration « %s » inconnu\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "montrer les photos d'identité en affichant les clefs"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "montrer les URL de politique en affichant les signatures"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "montrer toutes les notations en affichant les signatures"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "utiliser les notations aux normes IETF en affichant les signatures"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en affichant les signatures"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en affichant les signatures"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "indiquer la validité de l'identité en affichant les clefs"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "montrer les identités révoquées et expirées en affichant les clefs"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "indiquer les sous-clefs révoquées et expirées en affichant les clefs"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "montrer le nom du porte-clefs en affichant les clefs"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Remarque : l'ancien fichier d'options par défaut « %s » a été ignoré\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt est trop ancienne (nécessaire : %s, utilisé : %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Remarque : %s n'est pas pour une utilisation normale.\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "« %s » n'est pas un jeu de caractères valable\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'analyser l'URL du serveur de clefs\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s : %d : options d'importation incorrectes\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "options d'importation incorrectes\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s : %d : options d'exportation incorrectes\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "options d'exportation incorrectes\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s : %d : options de liste incorrectes\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "montrer les photos d'identité en vérifiant les signatures"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "montrer les URL de politique en vérifiant les signatures"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "montrer toutes les notations en vérifiant les signatures"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en vérifiant les signatures"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "indiquer la validité de l'identité en vérifiant les signatures"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "montrer les identités révoquées et expirées en vérifiant les signatures"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "ne montrer que l'identité principale en vérifiant les signatures"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "valider les signatures avec les données PKA"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "augmenter la confiance des signatures avec des données PKA valables"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s : %d : options de vérification incorrectes\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "options de vérification incorrectes\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de configurer le chemin d'exécution à %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s : %d : liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Attention : %s remplace %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s.\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s.\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "ne sera pas exécuté avec une mémoire non sécurisée à cause de %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "une signature détachée ou en texte clair n'est possible qu'en mode --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "signer et chiffrer en même temps n'est possible qu'en mode --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "des fichiers (et pas un tube) doivent être utilisés lorsque --pgp2\n"
 "est activé.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 nécessite l'algorithme de chiffrement "
 "IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression sélectionné est incorrect\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "« completes-needed » doit être supérieur à 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "« marginals-needed » doit être supérieur à 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "« max-cert-depth » doit être compris entre 1 et 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "« default-cert-level » incorrect ; doit être 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "« min-cert-level » incorrect ; doit être , 1, 2 ou 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Remarque : le mode S2K simple (0) est fortement déconseillé\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K incorrect ; doit être 0, 1 ou 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "préférences par défaut incorrectes\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "préférences personnelles de chiffrement incorrectes\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "préférences personnelles de hachage incorrectes\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "préférences personnelles de compression incorrectes\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne fonctionne pas encore avec %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "impossible d'utiliser l'algorithme de hachage « %s » en mode %s.\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "impossible d'utiliser l'algorithme de compression « %s » en mode %s.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Attention : les destinataires (-r) indiqués n'utilisent pas\n"
 "            de clef publique pour le chiffrement\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [fichier]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [fichier]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "échec du chiffrement symétrique de « %s » : %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [fichier]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [fichier]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "impossible d'utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "impossible d'utiliser --symmetric --encrypt en mode %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [fichier]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [fichier]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [fichier]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "impossible d'utiliser --symmetric --sign --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "impossible d'utiliser --symmetric --sign --encrypt en mode %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [fichier]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [fichier]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [fichier]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key identité"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key identité"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key identité [commandes]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <identité>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "échec d'envoi vers le serveur de clefs : %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "échec de réception depuis le serveur de clefs : %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "échec de recherche au sein du serveur de clefs : %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "échec de déconstruction d'une armure : %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "échec de construction d'une armure : %s \n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage « %s » incorrect\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[fichier]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message…\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donnée est incorrecte\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donnée est incorrecte\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de clefs favori qui a été donnée est incorrecte\n"
 
@@ -2976,7 +2973,6 @@ msgstr "clef %s : pas d'identité\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "« %s » a été ignorée : %s\n"
 
@@ -3106,7 +3102,6 @@ msgstr "clef %s : « %s » n'est pas modifiée\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "clef secrète « %s » introuvable : %s\n"
 
@@ -4070,12 +4065,12 @@ msgstr ""
 "forcément correcte avant d'avoir relancé le programme.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "révoquée"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "expirée"
 
@@ -4136,7 +4131,7 @@ msgstr "%d signatures supprimées\n"
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "incorrecte"
 
@@ -5473,26 +5468,37 @@ msgstr "%s : %u : option « %s » obsolète — non prise en compte\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "Attention : « %s » est une option obsolète — non prise en compte\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s : %u : option « %s » obsolète — non prise en compte\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "Attention : « %s » est une option obsolète — non prise en compte\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Non compressé"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "non compressé|non|sans"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option « %s » ambiguë\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option « %s » inconnue\n"
@@ -6244,7 +6250,6 @@ msgstr "Remarque : la clef de signature %s a été révoquée\n"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
@@ -6668,7 +6673,7 @@ msgstr "ultime"
 msgid "no need for a trustdb check\n"
 msgstr "inutile de vérifier la base de confiance\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n"
@@ -6687,41 +6692,41 @@ msgstr ""
 "inutile de mettre à jour la base de confiance avec le modèle de\n"
 "     confiance « %s »\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clef publique %s introuvable : %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "veuillez faire un --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "vérification de la base de confiance\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune clef de confiance ultime n'a été trouvée\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la clef publique de la clef de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginale(s) nécessaire(s), %d complète(s) nécessaire(s),\n"
 "     modèle de confiance %s\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6729,7 +6734,7 @@ msgstr ""
 "profondeur : %d  valables : %3d  signées : %3d\n"
 "     confiance : %d i., %d n.d., %d j., %d m., %d t., %d u.\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 596e1fd..60d738d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@ -113,7 +113,7 @@ msgstr "contrasinal err
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -123,7 +123,7 @@ msgstr "non se pode crear `%s': %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -366,7 +366,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -451,13 +451,11 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "non est� soportado"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "non est� soportado"
 
@@ -469,7 +467,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -489,7 +487,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -501,18 +499,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
@@ -647,7 +645,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -656,7 +654,7 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1710,7 +1708,7 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -2031,172 +2029,172 @@ msgstr "empr
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
@@ -2232,16 +2230,12 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2251,7 +2245,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2259,565 +2253,565 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -4166,13 +4160,13 @@ msgstr ""
 "correcta a menos que reinicie o programa.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4234,7 +4228,7 @@ msgstr "Borradas %d sinaturas.\n"
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
@@ -5566,27 +5560,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -6334,7 +6339,6 @@ msgstr "NOTA: a chave est
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
@@ -6755,7 +6759,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
@@ -6770,45 +6774,45 @@ msgstr "non se precisa comproba-la base de datos de confianza\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "non se atopou a chave p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
diff --git a/po/hu.po b/po/hu.po
index eefb82c..dd87655 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <nfl at nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -113,7 +113,7 @@ msgstr "rossz jelsz
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -123,7 +123,7 @@ msgstr "Nem tudom l
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -365,7 +365,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -448,13 +448,11 @@ msgstr "Hiba a jelsz
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nem t�mogatott"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "nem t�mogatott"
 
@@ -466,7 +464,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -484,7 +482,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -496,18 +494,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
@@ -642,7 +640,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -651,7 +649,7 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1700,7 +1698,7 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
@@ -2016,172 +2014,172 @@ msgstr "A %08lX m
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
@@ -2217,16 +2215,12 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2236,7 +2230,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2244,563 +2238,563 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -4134,13 +4128,13 @@ msgstr ""
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4201,7 +4195,7 @@ msgstr "T
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
@@ -5531,27 +5525,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -6295,7 +6300,6 @@ msgstr "MEGJEGYZ
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
@@ -6720,7 +6724,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
@@ -6735,45 +6739,45 @@ msgstr "Nincs sz
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
diff --git a/po/id.po b/po/id.po
index 2471607..90613f8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -118,7 +118,7 @@ msgstr "passphrase yang buruk"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -128,7 +128,7 @@ msgstr "tidak dapat membuat %s: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -370,7 +370,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -453,13 +453,11 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "tidak didukung"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "tidak didukung"
 
@@ -471,7 +469,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -489,7 +487,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -501,18 +499,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
@@ -647,7 +645,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -656,7 +654,7 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1706,7 +1704,7 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
@@ -2021,172 +2019,172 @@ msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
@@ -2222,16 +2220,12 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2241,7 +2235,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2249,571 +2243,571 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -4148,13 +4142,13 @@ msgstr ""
 "kecuali anda memulai kembali program.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4215,7 +4209,7 @@ msgstr "Menghapus %d signature.\n"
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
@@ -5535,27 +5529,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -6295,7 +6300,6 @@ msgstr "CATATAN: kunci telah dibatalkan"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s signature, algoritma digest %s\n"
 
@@ -6717,7 +6721,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@ -6732,45 +6736,45 @@ msgstr "tidak perlu memeriksa trustdb\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
diff --git a/po/it.po b/po/it.po
index a014696..b7819a5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2008-05-26 12:02+0200\n"
 "Last-Translator: Marco d'Itri <md at linux.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -113,7 +113,7 @@ msgstr "passphrase errata"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -123,7 +123,7 @@ msgstr "impossibile creare `%s': %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -365,7 +365,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -448,13 +448,11 @@ msgstr "errore nella creazione della passhprase: %s\n"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "non gestito"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "non gestito"
 
@@ -466,7 +464,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -484,7 +482,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -496,18 +494,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
@@ -642,7 +640,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -651,7 +649,7 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1702,7 +1700,7 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -2027,172 +2025,172 @@ msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
@@ -2228,16 +2226,12 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2247,7 +2241,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2255,566 +2249,566 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -4151,13 +4145,13 @@ msgstr ""
 "finch� non eseguirai di nuovo il programma.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4219,7 +4213,7 @@ msgstr "Cancellate %d firme.\n"
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
@@ -5552,27 +5546,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -6329,7 +6334,6 @@ msgstr "NOTA: la chiave 
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
@@ -6758,7 +6762,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimo controllo del trustdb sar� fatto il %s\n"
@@ -6773,45 +6777,45 @@ msgstr "non 
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
diff --git a/po/ja.po b/po/ja.po
index 72a4f91..e67b89a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.0.25\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2014-08-08 10:06+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
 "Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
@@ -114,7 +114,7 @@ msgstr "パスフレーズ"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -124,7 +124,7 @@ msgstr "「%s」が作成できません: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -363,7 +363,7 @@ msgstr "デーモン・モードで実行 (バックグラウンド)"
 msgid "run in server mode (foreground)"
 msgstr "サーバ・モードで実行 (フォアグラウンド)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -455,7 +455,7 @@ msgstr "|FILE|FILEに環境変数の設定も書き出す"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -473,7 +473,7 @@ msgstr ""
 "形式: gpg-agent [オプション] [コマンド [引数]]\n"
 "GnuPGの秘密鍵の管理\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "無効なdebug-level「%s」が与えられました\n"
@@ -485,18 +485,18 @@ msgstr "無効なdebug-level「%s」が与えられました\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "*注意*: デフォルトのオプション・ファイル「%s」がありません\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "オプション・ファイル「%s」: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "「%s」からオプションを読み込みます\n"
@@ -629,7 +629,7 @@ msgstr ""
 "形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
 "パスワードキャッシュの管理\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -638,7 +638,7 @@ msgstr ""
 "@コマンド:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1629,7 +1629,7 @@ msgstr "無効なコマンド (\"help\"を参照)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "このコマンドで--outputは機能しません\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "「%s」が開けません\n"
@@ -1928,163 +1928,163 @@ msgstr "副鍵%s(主鍵%sではなく)を用います\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "鍵%s: 公開鍵のない秘密鍵です - スキップします\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "署名を作成"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "クリア・テクスト署名を作成"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "分離署名を作成"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "データを暗号化"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "暗号化には共通鍵暗号方式のみを使用"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "データを復号 (デフォルト)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "署名を検証"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "鍵の一覧"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "鍵と署名の一覧"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "鍵署名の検査と一覧"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "鍵とフィンガー・プリントの一覧"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "秘密鍵の一覧"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "新しい鍵対を生成"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "失効証明書を生成"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "公開鍵リングから鍵を削除"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "秘密鍵リングから鍵を削除"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "鍵に署名"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "鍵へ内部的に署名"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "鍵への署名や編集"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "パスフレーズの変更"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "鍵をエクスポートする"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "鍵サーバに鍵をエクスポートする"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "鍵サーバから鍵をインポートする"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "鍵サーバの鍵を検索する"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "鍵サーバから鍵を全部更新する"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "鍵のインポート/マージ"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "カード・ステイタスを表示"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "カードのデータを変更"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "カードのPINを変更"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "信用データベースを更新"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "メッセージ・ダイジェストを表示"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "サーバ・モードで実行"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ASCII形式の外装を作成"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|USER-ID用に暗号化"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "正準テキスト・モードを使用"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|出力をFILEに書き出す"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "無変更"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "上書き前に確認"
 
@@ -2120,11 +2120,11 @@ msgstr ""
 " --list-keys [名前]         鍵を表示\n"
 " --fingerprint [名前]       フィンガー・プリントを表示\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "使い方: gpg [オプション] [ファイル] (ヘルプは -h)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2134,7 +2134,7 @@ msgstr ""
 "署名、検査、暗号化や復号\n"
 "デフォルトの操作は、入力データに依存\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2142,71 +2142,71 @@ msgstr ""
 "\n"
 "サポートしているアルゴリズム:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "公開鍵: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "暗号方式: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "ハッシュ: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "圧縮: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "使い方: gpg [オプション] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "対立するコマンド\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=記号が、グループ定義「%s」内に見つかりません\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "*警告*: homedir 「%s」の安全でない所有者\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル「%s」の安全でない所有者\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "*警告*: 拡張「%s」の安全でない所有者\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "*警告*: homedir 「%s」の安全でない許可\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル「%s」の安全でない許可\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "*警告*: 拡張「%s」の安全でない許可\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "*警告*: homedir 「%s」の安全でない上位ディレクトリ所有者\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2214,17 +2214,17 @@ msgstr ""
 "*警告*: コンフィグレーション・ファイル「%s」の安全でない上位ディレクトリ所有"
 "者\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "*警告*: 拡張「%s」の安全でない上位ディレクトリ所有者\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "*警告*: homedir 「%s」の安全でない上位ディレクトリ許可\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2232,458 +2232,458 @@ msgstr ""
 "*警告*: コンフィグレーション・ファイル「%s」の安全でない上位ディレクトリ許"
 "可\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "*警告*: 拡張「%s」の安全でない上位ディレクトリ許可\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "不明のコンフィグレーション項目「%s」\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "鍵の一覧にフォトIDを表示する"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "署名の一覧にポリシURLを表示する"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "署名の一覧にすべての注釈を表示する"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "署名の一覧にIETF標準注釈を表示する"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "署名の一覧にユーザの注釈を表示する"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "署名の一覧に優先鍵サーバURLを表示する"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "鍵の一覧にユーザIDの有効性を表示する"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "鍵の一覧に鍵リングの名前を表示する"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "署名の一覧に有効期限の日付を表示する"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "*注意*: 以前デフォルトだったオプション・ファイル「%s」は、無視されます\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt は古すぎます (必要 %s, 現在 %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "*注意*: 普通%sは使いません!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "「%s」は、有効な署名表現ではありません\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "「%s」は、有効な文字集合ではありません\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "鍵サーバのURLを解析不能\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "無効な鍵サーバ・オプションです\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無効なインポート・オプションです\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "無効なインポート・オプションです\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無効なエクスポート・オプションです\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "無効なエクスポート・オプションです\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無効な一覧オプションです\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "無効な一覧オプションです\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "署名の検証時にフォトIDを表示する"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "署名の検証時にポリシURLを表示する"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "署名の検証時にすべての注釈を表示する"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "署名の検証時にIETF標準注釈を表示する"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "署名の検証時にユーザの注釈を表示する"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "署名の検証時に優先鍵サーバURLを表示する"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "署名の検証時にユーザIDの有効性を表示する"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "署名の検証時に主なユーザIDだけをを表示する"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "PKAデータで署名を検証する"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "有効なPKAデータで署名の信用度を上昇させる"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無効な検証オプションです\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "無効な検証オプションです\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-pathを%sに設定不能\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無効な auto-key-locate リストです\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "無効な auto-key-locate リストです\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "*警告*: プログラムのコア・ファイルができることがあります!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "*警告*: %sは%sより優先\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%sは%sとともに使うことはできません!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%sは%sとともに使っても無意味です!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s のため、セキュアでないメモリで実行しません\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2モードでは分離署名かクリア・テクスト署名だけしかできません\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2モードでは署名と暗号化を同時にできません\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2を指定したら、(パイプでなく) ファイルを指定せねばなりません。\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2モードのメッセージ暗号化では、IDEA暗号方式が必要です\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "選択された暗号アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "選択された圧縮アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-neededは正の値が必要です\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neededは1より大きな値が必要です\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無効なdefault-cert-level。0か1か2か3でなければなりません\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "無効なデフォルトの優先指定\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "無効な個人用暗号方式の優先指定\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "無効な個人用ダイジェストの優先指定\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "無効な個人用圧縮の優先指定\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%sは%sではまだ機能しません\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "暗号アルゴリズム「%s」を%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "ダイジェスト・アルゴリズム「%s」を%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "圧縮アルゴリズム「%s」を%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信用データベースの初期化に失敗しました: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [ファイル名]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ファイル名]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "「%s」の共通鍵暗号に失敗しました: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ファイル名]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [ファイル名]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [ファイル名]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ファイル名]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [ファイル名]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ファイル名]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ファイル名]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ファイル名]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key ユーザid"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key ユーザid"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ユーザid [コマンド]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <ユーザid>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "鍵サーバへの送信に失敗しました: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "鍵サーバからの受信に失敗しました: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "鍵のエクスポートに失敗しました: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "鍵サーバの検索に失敗しました: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "鍵サーバの回復に失敗しました: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "外装除去に失敗しました: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "外装に失敗しました: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無効なハッシュ・アルゴリズム「%s」です\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[ファイル名]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "開始します。メッセージを打ってください ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "あたえられた証明書ポリシURLは無効です\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "あたえられた署名ポリシURLは無効です\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "指定された優先鍵サーバURLは無効です\n"
 
@@ -3939,12 +3939,12 @@ msgstr ""
 "ということを念頭においてください。\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "失効"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "期限切れ"
 
@@ -4004,7 +4004,7 @@ msgstr "%d個の署名を削除しました。\n"
 msgid "Nothing deleted.\n"
 msgstr "何も削除していません。\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "無効"
 
@@ -5291,26 +5291,39 @@ msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 "*警告*: \"%s\"は、使われなくなったオプションです - なんの効果もありません\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr ""
+"%s:%u: \"%s\"は、使われなくなったオプションです - なんの効果もありません\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+"*警告*: \"%s\"は、使われなくなったオプションです - なんの効果もありません\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "無圧縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "無圧縮|なし"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "このメッセージは、%sでは使用できません\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "あいまいなオプション「%s」\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "不明のオプション「%s」\n"
@@ -6423,7 +6436,7 @@ msgstr "究極"
 msgid "no need for a trustdb check\n"
 msgstr "信用データベースの検査は、不要です\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "次回の信用データベース検査は、%sです\n"
@@ -6438,45 +6451,45 @@ msgstr "信用モデル「%s」で信用データベースの検査は、不要
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "信用モデル「%s」で信用データベースの更新は、不要です\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "公開鍵%sが見つかりません: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdbを実行してください\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "信用データベースの検査\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d本の鍵を処理 (うち%d本の有効性数をクリア)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "絶対的に信用する鍵が見つかりません\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "絶対的に信用する鍵%sの公開鍵が見つかりません\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "「まぁまぁの信用」%d、「全面的信用」%d、%s信用モデル\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深さ: %d  有効性: %3d  署名: %3d  信用: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index d9ae3cc..6aa8caf 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 at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <Trond.Endrestol at fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb at lister.ping.uio.no>\n"
@@ -117,7 +117,7 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -127,7 +127,7 @@ msgstr "kan ikke opprette 
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -377,7 +377,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -474,7 +474,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -492,7 +492,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -504,18 +504,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
@@ -648,7 +648,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -657,7 +657,7 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1667,7 +1667,7 @@ msgstr "Ugyldig kommando  (pr
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
@@ -1975,171 +1975,171 @@ msgstr "bruker undern
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "liste n�kler"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "liste n�kler og signaturer"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "signere en n�kkel"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "signere en n�kkel lokalt"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "signere eller redigere en n�kkel"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "endre passfrasen"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "oppdatere alle n�klene fra en n�kkelserver"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importere/flette n�kler"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "vis kortets status"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "endre data p� et kort"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "endre PIN p� et kort"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "oppdatere tillitsdatabasen"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "sp�r f�r overskriving"
 
@@ -2175,16 +2175,12 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2194,7 +2190,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2202,73 +2198,73 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, 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:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2276,20 +2272,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
 "�%s�\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, 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:1414
+#: g10/gpg.c:1423
 #, 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:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2297,461 +2293,461 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, 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:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 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:3090
+#: g10/gpg.c:3112
 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:3096
+#: g10/gpg.c:3118
 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:3109
+#: g10/gpg.c:3131
 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:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 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:3216
+#: g10/gpg.c:3238
 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:3218
+#: g10/gpg.c:3240
 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:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 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:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, 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:3329
+#: g10/gpg.c:3351
 #, 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:3334
+#: g10/gpg.c:3356
 #, 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:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 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:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, 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:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, 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:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2945,7 +2941,6 @@ msgstr "n
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "hoppet over �%s�: %s\n"
 
@@ -3075,7 +3070,6 @@ msgstr "n
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
 
@@ -3998,12 +3992,12 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "opphevet"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "utg�tt"
 
@@ -4058,7 +4052,7 @@ msgstr "Slettet %d signaturer.\n"
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "ugyldig"
 
@@ -5354,26 +5348,37 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr ""
+
+#: g10/misc.c:863
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
@@ -6087,7 +6092,6 @@ msgstr "NOTIS: signaturn
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
@@ -6484,7 +6488,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -6499,45 +6503,45 @@ msgstr ""
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "fant ikke offentlig n�kkel %s: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index f31d674..b600095 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.20\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2013-05-12 17:25+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -113,7 +113,7 @@ msgstr "Has
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -123,7 +123,7 @@ msgstr "nie mo
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -372,7 +372,7 @@ msgstr "uruchomienie w trybie demona (w tle)"
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -442,7 +442,6 @@ msgstr "nie u
 
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
 
@@ -466,7 +465,7 @@ msgstr "|PLIK|zapis ustawie
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -484,7 +483,7 @@ msgstr ""
 "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
 "Zarz�dzanie kluczem tajnym dla GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
@@ -496,18 +495,18 @@ msgstr "podano b
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
@@ -641,7 +640,7 @@ msgstr ""
 "Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
 "Utrzymuwanie pami�ci hase�\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -650,7 +649,7 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1641,7 +1640,7 @@ msgstr "Niepoprawne polecenie  (spr
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -1947,165 +1946,165 @@ msgstr "u
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %s: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "z�o�enie podpisu"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "wypisanie i sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "zmiana has�a"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "wy�wietlenie stanu karty"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "zmiana danych na karcie"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "zmiana PIN-u karty"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "wypisanie skr�t�w wiadomo�ci"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|U�YTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|U�YTKOWNIK|u�ycie tego identyfikatora u�ytkownika do podpisania lub "
 "odszyfrowania"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|PLIK|zapis wyj�cia do PLIKU"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
@@ -2143,11 +2142,11 @@ msgstr ""
 " --list-keys [nazwy]        pokazanie klucze\n"
 " --fingerprint [nazwy]      pokazanie odcisk�w kluczy\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2157,7 +2156,7 @@ msgstr ""
 "Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie\n"
 "Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2165,76 +2164,76 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2242,21 +2241,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2264,469 +2263,469 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika na listach kluczy"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "biblioteka libgcrypt jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika przy sprawdzaniu "
 "podpis�w"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpis�w z danymi PKA"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nie zadzia�a z niebezpieczn� pami�ci� z powodu %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [plik]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [plik]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <id-u�ytkownika>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
 
@@ -2921,7 +2920,6 @@ msgstr "klucz %s: brak identyfikatora u
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "pomini�ty ,,%s'': %s\n"
 
@@ -3051,7 +3049,6 @@ msgstr "klucz %s: ,,%s'' bez zmian\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
 
@@ -4018,12 +4015,12 @@ msgstr ""
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "uniewa�niony"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "wygas�"
 
@@ -4083,7 +4080,7 @@ msgstr "%d podpis
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "niepoprawny"
 
@@ -5397,26 +5394,37 @@ msgstr "%s:%u: przestarza
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "nieskompresowany|brak"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
@@ -6150,7 +6158,6 @@ msgstr "UWAGA: klucz podpisuj
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "podpis %s, skr�t %s\n"
 
@@ -6564,7 +6571,7 @@ msgstr "absolutne"
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
@@ -6579,39 +6586,39 @@ msgstr "sprawdzanie bazy jest niepotrzebne przy modelu zaufania ,,%s''\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "aktualizacja bazy jest niepotrzebna przy modelu zaufania ,,%s''\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %s nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "potrzeba %d marginalnych, %d pe�nych, model zaufania %s\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6619,7 +6626,7 @@ msgstr ""
 "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
 "%du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 2ad7715..e75ca5c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais at kde.org>\n"
 "Language-Team: pt <morais at kde.org>\n"
@@ -116,7 +116,7 @@ msgstr "frase secreta incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -126,7 +126,7 @@ msgstr "imposs
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -368,7 +368,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -452,13 +452,11 @@ msgstr "erro na cria
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "n�o suportado"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "n�o suportado"
 
@@ -470,7 +468,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -488,7 +486,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -500,18 +498,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
@@ -646,7 +644,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -655,7 +653,7 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1706,7 +1704,7 @@ msgstr "Comando inv
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -2020,176 +2018,176 @@ msgstr "usando chave secund
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
@@ -2225,16 +2223,12 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2244,7 +2238,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2252,564 +2246,564 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -4148,13 +4142,13 @@ msgstr ""
 "correcta a n�o ser que reinicie o programa.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4213,7 +4207,7 @@ msgstr "%d assinaturas removidas.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
@@ -5542,28 +5536,39 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+
+#: g10/misc.c:924
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -6720,7 +6725,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
@@ -6735,48 +6740,48 @@ msgstr "n
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2c1980d..68bafc5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -120,7 +120,7 @@ msgstr "frase secreta incorreta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -130,7 +130,7 @@ msgstr "imposs
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -373,7 +373,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -457,14 +457,12 @@ msgstr "erro na cria
 # suportado ???
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "n�o suportado"
 
 # suportado ???
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "n�o suportado"
 
@@ -476,7 +474,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -494,7 +492,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -506,18 +504,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
@@ -650,7 +648,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -659,7 +657,7 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1717,7 +1715,7 @@ msgstr "Comando inv
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -2027,182 +2025,182 @@ msgstr "usando chave secund
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "imprime todos os \"digests\" de mensagens"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr ""
 
@@ -2236,16 +2234,12 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2255,7 +2249,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2263,574 +2257,574 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -4153,13 +4147,13 @@ msgid ""
 msgstr ""
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4216,7 +4210,7 @@ msgstr "%d assinaturas removidas.\n"
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
@@ -5553,28 +5547,39 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/misc.c:924
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -6729,7 +6734,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
@@ -6744,47 +6749,47 @@ msgstr "%s: n
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
diff --git a/po/ro.po b/po/ro.po
index a61e146..41dc9c9 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz at rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@ -119,7 +119,7 @@ msgstr "fraz
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -129,7 +129,7 @@ msgstr "nu pot crea `%s': %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -379,7 +379,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -462,13 +462,11 @@ msgstr "eroare la crearea frazei-parol
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nu este suportat(�)"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "nu este suportat(�)"
 
@@ -480,7 +478,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -498,7 +496,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -510,18 +508,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
@@ -656,7 +654,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -665,7 +663,7 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1690,7 +1688,7 @@ msgstr "Comand
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
@@ -2002,171 +2000,171 @@ msgstr "folosim subcheia %s 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
@@ -2202,16 +2200,12 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2221,7 +2215,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2229,77 +2223,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2307,21 +2301,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2329,476 +2323,476 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2998,7 +2992,6 @@ msgstr "cheia %s: nici un ID utilizator\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "s�rit� \"%s\": %s\n"
 
@@ -3128,7 +3121,6 @@ msgstr "cheia %s: \"%s\" nu a fost schimbat
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
@@ -4087,12 +4079,12 @@ msgstr ""
 
 #
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "revocat�"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "expirat�"
 
@@ -4152,7 +4144,7 @@ msgstr "Am 
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "invalid(�)"
 
@@ -5455,27 +5447,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
@@ -6215,7 +6218,6 @@ msgstr "NOT
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
@@ -6625,7 +6627,7 @@ msgstr "suprem
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
@@ -6640,47 +6642,47 @@ msgstr "nu e nevoie de o verificare trustdb cu modelul de 
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index a234223..8b0e5e8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.10\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2008-12-21 00:40+0200\n"
 "Last-Translator: Maxim Britov <maxim.britov at gmail.com>\n"
 "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
@@ -115,7 +115,7 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -125,7 +125,7 @@ msgstr "не могу создать `%s': %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -351,7 +351,6 @@ msgstr "Да, защита мне не нужна"
 
 #: agent/genkey.c:308
 #, fuzzy, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
@@ -376,7 +375,7 @@ msgstr "запуск в режиме демона (background)"
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -446,7 +445,6 @@ msgstr "не использовать кеш PIN при подписывании
 
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
@@ -456,7 +454,6 @@ msgstr "разрешить предустановленную фразу-пар
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "разрешить эмуляцию ssh-агента"
 
@@ -472,7 +469,7 @@ msgstr "|FILE|сохранить состояние окружения и в ф
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -490,7 +487,7 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
@@ -502,18 +499,18 @@ msgstr "запрошен недупустимый уровень отладки
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s слишком устарело (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
@@ -647,7 +644,7 @@ msgstr ""
 "Синтаксис: gpg-preset-passphrase [параметры] KEYGRIP\n"
 "Кеширование паролей\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -656,7 +653,7 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1654,7 +1651,7 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
@@ -1956,163 +1953,163 @@ msgstr "использую подклключ %s вместо главного 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "создать подпись"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "создать прозрачную подпись"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписи"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей c отпечатками"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "сменить фразу-пароль"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "вывести хэши файлов"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифровать для USER-ID"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|использовать USER-ID для подписывания и расшифрования"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 без сжатия)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
@@ -2148,16 +2145,12 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2167,7 +2160,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование.\n"
 "Действие по умолчанию зависит от входных данных.\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2175,92 +2168,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "  с открытым ключом: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "  симметричные шифры: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "  хэш-функции: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "  алгоритмы сжатия: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2268,465 +2261,465 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания при распечатке подписей"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать стандартные IETF примечания при распечатке подписей"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать предпочитаемый сервер ключей при распечатке подписей"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке ключей"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей при распечатке ключей"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения при распечатке подписей"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "отображать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "печатать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "печатать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "печатать стандартные IETF примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "печатать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "печатать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "печатать только главный User ID при проверке подписей"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[имяфайла]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2926,7 +2919,6 @@ msgstr "ключ %s: не имеет User ID\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
@@ -3056,7 +3048,6 @@ msgstr "ключ %s: \"%s\" не изменен\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
@@ -3995,12 +3986,12 @@ msgstr ""
 "пока программа не будет перезапущена.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "отозван"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "просрочен с"
 
@@ -4059,7 +4050,7 @@ msgstr "Удалено %d подписи.\n"
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "недопустимый"
 
@@ -5351,26 +5342,37 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ВНИМАНИЕ: \"%s\" устаревший параметр - он не задействован\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "ВНИМАНИЕ: \"%s\" устаревший параметр - он не задействован\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "ВНИМАНИЕ: \"%s\" устаревший параметр - он не задействован\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "без сжатия"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
@@ -6100,7 +6102,6 @@ msgstr "ЗАМЕЧАНИЕ: ключ %s подписи - отозван\n"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
@@ -6508,7 +6509,7 @@ msgstr "абсолютно"
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
@@ -6523,40 +6524,40 @@ msgstr "нет необходимости проверять таблицу до
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости обновлять таблицу доверий при '%s' модели доверий\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d действующих записей очищено)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6564,7 +6565,7 @@ msgstr ""
 "глубина: %d  корректных: %3d  подписанных: %3d  доверия: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6728,9 +6729,6 @@ msgstr "Использование: kbxutil [параметры] [файлы] (-
 
 #: kbx/kbxutil.c:120
 #, fuzzy
-#| msgid ""
-#| "Syntax: kbxutil [options] [files]\n"
-#| "list, export, import Keybox data\n"
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
@@ -6922,7 +6920,6 @@ msgstr "||Введите PIN"
 
 #: scd/app-openpgp.c:2258
 #, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Введите PIN"
 
@@ -7009,7 +7006,6 @@ msgstr "нет доступа %s - неработоспособная карта
 
 #: scd/app-dinsig.c:299
 #, fuzzy
-#| msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 msgid "||Please enter your PIN at the reader's pinpad"
 msgstr "||Введите PIN на клавиатуре считывателя%%0A[подписей: %lu]"
 
@@ -7054,7 +7050,6 @@ msgstr "|N|отсоединить карту по истечении N секу
 
 #: scd/scdaemon.c:144
 #, fuzzy
-#| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "не использовать клавиатуру считывателя"
 
@@ -7413,25 +7408,21 @@ msgstr "ошибка получения информации применимо
 
 #: sm/certlist.c:142
 #, fuzzy
-#| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "сертификат не следует использовать для сертификации\n"
 
 #: sm/certlist.c:154
 #, fuzzy
-#| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "сертификат не следует использовать для подписывания\n"
 
 #: sm/certlist.c:165
 #, fuzzy
-#| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "сертификат не следует использовать для шифрования\n"
 
 #: sm/certlist.c:166
 #, fuzzy
-#| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "сертификат не следует использовать для подписывания\n"
 
@@ -7781,10 +7772,6 @@ msgstr "Использование: gpgsm [параметры] [файлы] (-h
 
 #: sm/gpgsm.c:525
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpgsm [options] [files]\n"
-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
diff --git a/po/sk.po b/po/sk.po
index 6eec58e..907adcb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -116,7 +116,7 @@ msgstr "nespr
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -126,7 +126,7 @@ msgstr "nem
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -368,7 +368,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -451,13 +451,11 @@ msgstr "chyba pri vytv
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nepodporovan�"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "nepodporovan�"
 
@@ -469,7 +467,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -489,7 +487,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -501,18 +499,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
@@ -647,7 +645,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -656,7 +654,7 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1706,7 +1704,7 @@ msgstr "Neplatn
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
@@ -2023,176 +2021,176 @@ msgstr "pou
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [s�bory]|vyp� hash"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
@@ -2229,16 +2227,12 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2248,7 +2242,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2256,570 +2250,570 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m�e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep�e %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m�ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem�ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem�ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem�ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem�em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -4160,13 +4154,13 @@ msgstr ""
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4226,7 +4220,7 @@ msgstr "Zmazan
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
@@ -5550,27 +5544,38 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -6311,7 +6316,6 @@ msgstr "POZN
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
@@ -6736,7 +6740,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
@@ -6751,45 +6755,45 @@ msgstr "nie je nutn
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
diff --git a/po/sv.po b/po/sv.po
index beec96a..24c1458 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2011-01-12 14:53+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -136,7 +136,7 @@ msgstr "Lösenfras"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -146,7 +146,7 @@ msgstr "kan inte skapa \"%s\": %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -253,7 +253,6 @@ msgstr "Nollställ kod"
 
 #: agent/divert-scd.c:238
 #, fuzzy, c-format
-#| msgid "%s%%0A%%0AUse the reader's keypad for input."
 msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgstr "%s%%0A%%0AAnvänd läsarens knappsats för inmatning."
 
@@ -366,7 +365,6 @@ msgstr "Ja, skydd behövs inte"
 # fel kapitalisering i originalet?
 #: agent/genkey.c:308
 #, fuzzy, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Ange lösenfrasen för%0Aför att skydda din nya nyckel"
 
@@ -392,7 +390,7 @@ msgstr "kör i demonläge (bakgrund)"
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -463,7 +461,6 @@ msgstr "använd inte mellanlagring av PIN-kod vid signering"
 # Antar att värdet inte ska översättas.
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
@@ -473,7 +470,6 @@ msgstr "tillåt förinställning av lösenfras"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktivera ssh-agent-emulering"
 
@@ -489,7 +485,7 @@ msgstr "|FIL|skriv även miljöinställningar till FIL"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -509,7 +505,7 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
@@ -521,18 +517,18 @@ msgstr "ogiltig debug-level \"%s\" angiven\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
@@ -668,7 +664,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -678,7 +674,7 @@ msgstr ""
 " "
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1685,7 +1681,7 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -1993,164 +1989,164 @@ msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "skapa en signatur"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "skapa en klartextsignatur"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering endast med symmetriskt chiffer"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "skriv ut kontrollsummor"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID för att signera eller dekryptera"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|skriv utdata till FIL"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
@@ -2188,17 +2184,13 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2208,7 +2200,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2216,74 +2208,74 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2291,19 +2283,19 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2311,474 +2303,474 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <användaridentitet>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -2978,7 +2970,6 @@ msgstr "nyckel %s: ingen användaridentitet\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
@@ -3111,7 +3102,6 @@ msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
@@ -4072,12 +4062,12 @@ msgstr ""
 "såvida inte du startar om programmet.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "spärrad"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "utgånget"
 
@@ -4138,7 +4128,7 @@ msgstr "Raderade %d signaturer.\n"
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "ogiltigt"
 
@@ -5462,26 +5452,37 @@ msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
@@ -6233,7 +6234,6 @@ msgstr "OBSERVERA: signaturnyckeln %s har spärrats\n"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
@@ -6662,7 +6662,7 @@ msgstr "förbehållslös"
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@ -6679,48 +6679,48 @@ msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika nyckeln %s hittades inte: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
 # originalet borde ha ett value
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(er) behövs, %d fullständig(a) behövs, tillitsmodell %s\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6885,9 +6885,6 @@ msgstr "Användning: kbxutil [flaggor] [filer] (-h för hjälp)"
 
 #: kbx/kbxutil.c:120
 #, fuzzy
-#| msgid ""
-#| "Syntax: kbxutil [options] [files]\n"
-#| "list, export, import Keybox data\n"
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
@@ -7075,13 +7072,11 @@ msgstr "|N|Ny PIN-kod"
 
 #: scd/app-openpgp.c:2257
 #, fuzzy
-#| msgid "|A|Please enter the Admin PIN"
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
 #: scd/app-openpgp.c:2258
 #, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Ange PIN-koden"
 
@@ -7168,7 +7163,6 @@ msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 
 #: scd/app-dinsig.c:299
 #, fuzzy
-#| msgid "||Please enter your PIN at the reader's keypad"
 msgid "||Please enter your PIN at the reader's pinpad"
 msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 
@@ -7213,7 +7207,6 @@ msgstr "|N|koppla från kortet efter N sekunder inaktivitet"
 
 #: scd/scdaemon.c:144
 #, fuzzy
-#| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "använd inte läsarens knappsats"
 
@@ -7572,25 +7565,21 @@ msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
 
 #: sm/certlist.c:142
 #, fuzzy
-#| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikatet skulle inte använts för certifiering\n"
 
 #: sm/certlist.c:154
 #, fuzzy
-#| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
 #: sm/certlist.c:165
 #, fuzzy
-#| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikatet skulle inte använts för kryptering\n"
 
 #: sm/certlist.c:166
 #, fuzzy
-#| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
@@ -7942,10 +7931,6 @@ msgstr "Användning: gpgsm [flaggor] [filer] (-h för hjälp)"
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
 #: sm/gpgsm.c:525
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpgsm [options] [files]\n"
-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
diff --git a/po/tr.po b/po/tr.po
index c840cd8..ddaffae 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2008-12-14 23:25+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun at belgeler.gen.tr>\n"
 "Language-Team: Turkish\n"
@@ -113,7 +113,7 @@ msgstr "Anahtar Parolası"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -123,7 +123,7 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -343,7 +343,6 @@ msgstr "Evet, korumak gereksiz"
 
 #: agent/genkey.c:308
 #, fuzzy, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Yeni anahtarınızı korumak için Lütfen%0AAnahtar Parolanızı giriniz"
 
@@ -368,7 +367,7 @@ msgstr "artalan süreci olarak çalışır"
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -438,7 +437,6 @@ msgstr "imzalarken PIN arabelleği kullanılmaz"
 
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
@@ -448,7 +446,6 @@ msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "ssh-agent öykünümü etkinleşir"
 
@@ -464,7 +461,7 @@ msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 #, fuzzy
@@ -483,7 +480,7 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
@@ -495,18 +492,18 @@ msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
@@ -640,7 +637,7 @@ msgstr ""
 "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -649,7 +646,7 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1650,7 +1647,7 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
@@ -1957,165 +1954,165 @@ msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "bir imza yapar"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "ileti özetlerini gösterir"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
 "kullanılır"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|DOSYA|çıktı DOSYAya yazılır"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
@@ -2151,16 +2148,12 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2170,7 +2163,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2178,554 +2171,554 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "kullanıcı kimlikleri gösterilir"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "yardımcı anahtarlar gösterilir"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
 "gösterilir"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "imza doğrulamasında sadece birincil kullanıcı kimlik gösterilir"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özet tercihleri geçersiz\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2925,7 +2918,6 @@ msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
@@ -3055,7 +3047,6 @@ msgstr "anahtar %s: \"%s\" değişmedi\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
@@ -4037,12 +4028,12 @@ msgstr ""
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
@@ -4102,7 +4093,7 @@ msgstr "%d imza silindi.\n"
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "geçersiz"
 
@@ -5419,26 +5410,37 @@ msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
@@ -6175,7 +6177,6 @@ msgstr "BİLGİ: imza anahtarı %s yürürlükten kaldırılmıştı\n"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s imzası, %s özet algoritması\n"
 
@@ -6590,7 +6591,7 @@ msgstr "son derece"
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
@@ -6605,39 +6606,39 @@ msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6645,7 +6646,7 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6809,9 +6810,6 @@ msgstr "Kullanımı: kbxutil [seçenekler] [dosyalar] (yardım için -h)"
 
 #: kbx/kbxutil.c:120
 #, fuzzy
-#| msgid ""
-#| "Syntax: kbxutil [options] [files]\n"
-#| "list, export, import Keybox data\n"
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
@@ -7007,7 +7005,6 @@ msgstr "||Lütfen PIN'i giriniz"
 
 #: scd/app-openpgp.c:2258
 #, fuzzy
-#| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
@@ -7093,7 +7090,6 @@ msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 
 #: scd/app-dinsig.c:299
 #, fuzzy
-#| msgid "||Please enter your PIN at the reader's keypad"
 msgid "||Please enter your PIN at the reader's pinpad"
 msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
 
@@ -7138,7 +7134,6 @@ msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
 
 #: scd/scdaemon.c:144
 #, fuzzy
-#| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
@@ -7499,25 +7494,21 @@ msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
 
 #: sm/certlist.c:142
 #, fuzzy
-#| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "sertifika onaylama için kullanılmamalıydı\n"
 
 #: sm/certlist.c:154
 #, fuzzy
-#| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
 
 #: sm/certlist.c:165
 #, fuzzy
-#| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "sertifika şifreleme için kullanılmamalıydı\n"
 
 #: sm/certlist.c:166
 #, fuzzy
-#| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "sertifika imzalama için kullanılmamalıydı\n"
 
@@ -7870,10 +7861,6 @@ msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
 
 #: sm/gpgsm.c:525
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpgsm [options] [files]\n"
-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
diff --git a/po/uk.po b/po/uk.po
index 8763d56..24c6a8b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2013-04-27 14:41+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
@@ -117,7 +117,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 "підтримки ключів ssh, що складаються з понад %d бітів, не передбачено\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -127,7 +127,7 @@ msgstr "не вдалося створити «%s»: %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -378,7 +378,7 @@ msgstr "запустити у режимі фонової служби (фоно
 msgid "run in server mode (foreground)"
 msgstr "запустити у режимі сервера (основному)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -448,7 +448,6 @@ msgstr "не використовувати кеш пін-кодів для пі
 
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "дозволити клієнтам позначати ключі як надійні"
 
@@ -458,7 +457,6 @@ msgstr "дозволити попереднє встановлення паро
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "увімкнути емуляцію ssh-агента"
 
@@ -474,7 +472,7 @@ msgstr "записати параметри середовища і до фай
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -492,7 +490,7 @@ msgstr ""
 "Синтаксис: gpg-agent [параметри] [команда [аргументи]]\n"
 "Керування закритими ключами у GnuPG\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "вказано некоректне значення рівня діагностики «%s»\n"
@@ -504,18 +502,18 @@ msgstr "вказано некоректне значення рівня діаг
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл параметрів «%s»: %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "прочитати параметри з «%s»\n"
@@ -651,7 +649,7 @@ msgstr ""
 "Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
 "Керування кешем паролів\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -660,7 +658,7 @@ msgstr ""
 "@Команди:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1661,7 +1659,7 @@ msgstr "Некоректна команда  (скористайтеся ком
 msgid "--output doesn't work for this command\n"
 msgstr "--output не працює з цією командою\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не вдалося відкрити «%s»\n"
@@ -1976,165 +1974,165 @@ msgstr "використовуємо підключ %s замість основ
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: закритий ключ без відкритого ключа — пропущено\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "створити підпис"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "створити текстовий підпис"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "створити від’єднаний підпис"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "зашифрувати дані"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "шифрувати лише за допомогою симетричного шифру"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "розшифрувати дані (типова дія)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "перевірити підпис"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "показати список ключів"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "показати список ключів і підписів"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "показати список і перевірити підписи ключів"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "показати список ключів і відбитків"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "показати список закритих ключів"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "створити пару ключів"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "створити сертифікат відкликання"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "вилучити ключі з відкритого сховища ключів"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "вилучити ключів з закритого сховища ключів"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "підписати ключ"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "підписати ключ локально"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "підписати або редагувати ключ"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "змінити пароль"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "експортувати ключі"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "експортувати ключі на сервер ключів"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "імпортувати ключі з сервера ключів"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "шукати ключі на сервері ключів"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "оновити всі ключів з сервера ключів"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "імпортувати/об’єднати ключі"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "показати дані про стан картки"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "змінити дані на картці"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "змінити пінкод картки"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "оновити базу даних довіри"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "показати контрольні суми повідомлень"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "запустити у режимі сервера"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "створити дані у форматі ASCII"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|USER-ID|використовувати для створення підписів або розшифрування вказаний "
 "ідентифікатор"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "використовувати канонічний текстовий режим"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|записати дані до вказаного файла"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "не вносити змін"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "запитувати перед перезаписом"
 
@@ -2172,11 +2170,11 @@ msgstr ""
 " --list-keys [назви]        показати ключі\n"
 " --fingerprint [назви]      показати відбитки\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Використання: gpg [параметри] [файли] (-h — довідка)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2186,7 +2184,7 @@ msgstr ""
 "Підписування, перевірка підписів, шифрування або розшифрування\n"
 "Типова дія залежатиме від вхідних даних\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2194,75 +2192,75 @@ msgstr ""
 "\n"
 "Підтримувані алгоритми:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "Відкритий ключ: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "Шифр: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "Хеш: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "Стиснення: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "використання: gpg [параметри] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "несумісні команди\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "у визначенні групи «%s» немає знаку «=»\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2270,21 +2268,21 @@ msgstr ""
 "УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
 "«%s» не є безпечним\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2292,483 +2290,483 @@ msgstr ""
 "УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невідомий пункт налаштувань «%s»\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "показувати фотоідентифікатори у списках ключів"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "показувати адреси правил у списках підписів"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "показувати всі примітки у списках підписів"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "показувати стандартні примітки IETF у списках підписів"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "показувати примітки користувача у списках підписів"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показувати адреси основних серверів ключів у списках підписів"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показувати відкликані та застарілі ідентифікатори користувачів у списках "
 "ключів"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показувати відкликані та застарілі підключі у списках ключів"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "показувати назву сховища ключів у списках ключів"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершення строків дії у списку підписів"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt занадто стара (потрібна — %s, маємо %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "«%s» не є коректним набором символів\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "не вдалося обробити адресу сервера ключів\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: некоректні параметри сервера ключів\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "некоректні параметри сервера ключів\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: некоректні параметри імпортування\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "некоректні параметри імпортування\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: некоректні параметри експортування\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "некоректні параметри експортування\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: некоректні параметри побудови списку\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "некоректні параметри побудови списку\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "показувати фотоідентифікатори під час перевірки підписів"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "показувати адреси правил під час перевірки підписів"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "показувати всі примітки під час перевірки підписів"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "показувати стандартні примітки IETF під час перевірки підписів"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "показувати вказані користувачем примітки під час перевірки підписів"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "показувати адреси основних серверів ключів у списках перевірки підписів"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показувати чинність ідентифікаторів користувача під час перевірки підписів"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показувати відкликані та застарілі ідентифікатори користувачів у списках "
 "перевірки підписів"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показувати лише основний ідентифікатор користувача під час перевірки підписів"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "перевірити підписи за допомогою даних PKA"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "підняти рівень довіри до підписів з коректними даними PKA"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: некоректні параметри перевірки\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "некоректні параметри перевірки\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не вдалося встановити шлях для запуску у значення %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: некоректний список auto-key-locate\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "некоректний список auto-key-locate\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "УВАГА: %s перевизначає %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не можна використовувати разом з %s!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s є зайвим, якщо використано %s!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "від’єднані та текстові підписи можна створювати лише у режимі --pgp2\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "у режимі --pgp2 не можна одночасно підписувати і зашифровувати дані\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "вам слід використовувати файли (не канали даних) під час роботи з увімкненим "
 "--pgp2.\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "шифрування повідомлень у режимі --pgp2 потребує використання шифру IDEA\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "вибраний алгоритм шифрування є некоректним\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "вибраний алгоритм стискання є некоректним\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "значення completes-needed має бути більшим за 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "значення marginals-needed має перевищувати 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "некоректне значення default-cert-level; має бути 0, 1, 2 або 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
 "S2K (0)\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "некоректні типові параметри\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "некоректні особисті параметри шифрування\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "некоректні особисті параметри контрольної суми\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "некоректні особисті параметри стискання\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ще не може працювати разом з %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
 "%s\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
 "ключем\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [назва файла]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва файла]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва файла]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [назва файла]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
 "mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [назва файла]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва файла]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [назва файла]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
 "s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
 "%s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва файла]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва файла]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва файла]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команди]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd <ідентифікатор-користувача>"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "помилка під час спроби експортування ключа: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "помилка пошуку на сервері ключів: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "помилка оновлення з сервера ключів: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "помилка перетворення з формату ASCII: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "помилка перетворення у формат ASCII: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "некоректний алгоритм хешування «%s»\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[назва файла]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "Почніть вводити ваше повідомлення...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "вказана адреса правил сертифікації є некоректною\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "вказана адреса правил підписування є некоректною\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "вказана адреса основного сервера ключів є некоректною\n"
 
@@ -2965,7 +2963,6 @@ msgstr "ключ %s: немає ідентифікатор користувач
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "пропущено «%s»: %s\n"
 
@@ -3095,7 +3092,6 @@ msgstr "ключ %s: «%s» не змінено\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "закритий ключ «%s» не знайдено: %s\n"
 
@@ -4053,12 +4049,12 @@ msgstr ""
 "до перезапуску програми.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "відкликано"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "збіг строк дії"
 
@@ -4120,7 +4116,7 @@ msgstr "Вилучено %d підписів.\n"
 msgid "Nothing deleted.\n"
 msgstr "Нічого не вилучено.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "некоректний"
 
@@ -5436,26 +5432,37 @@ msgstr "%s:%u: застарілий параметр «%s» — він не пр
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "УВАГА: «%s» є застарілим параметром — він не працюватиме\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: застарілий параметр «%s» — він не працюватиме\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "УВАГА: «%s» є застарілим параметром — він не працюватиме\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "Нестиснений"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "uncompressed|немає"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "використання цього повідомлення щодо %s може бути неможливим\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "неоднозначний параметр «%s»\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "невідомий параметр «%s»\n"
@@ -6189,7 +6196,6 @@ msgstr "ЗАУВАЖЕННЯ: ключ підпису %s було відклик
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s підпис, алгоритм контрольної суми %s\n"
 
@@ -6607,7 +6613,7 @@ msgstr "безмежна"
 msgid "no need for a trustdb check\n"
 msgstr "потреби у перевірці trustdb немає\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "наступну перевірку trustdb призначено на %s\n"
@@ -6622,39 +6628,39 @@ msgstr "потреби у перевірці trustdb на основі моде
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "потреби у оновленні trustdb на основі моделі довіри «%s» немає\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "відкритий ключ %s не знайдено: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "будь ласка, скористайтеся параметром --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "перевірка trustdb\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "Оброблено %d ключів (очищено %d значень чинності)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "не знайдено ключів з необмеженою довірою\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "потрібно %d обмежених, потрібно %d повних, модель довіри %s\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6662,7 +6668,7 @@ msgstr ""
 "глибина: %d  чинність: %3d  підписано: %3d  надійність: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d1d7a67..36340e6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2009-07-09 10:03+0200\n"
 "Last-Translator: Meng Jie <zuxyhere at eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\n"
@@ -119,7 +119,7 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -129,7 +129,7 @@ msgstr "无法建立‘%s’:%s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -377,7 +377,7 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -460,13 +460,11 @@ msgstr "生成密码的时候发生错误:%s\n"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "not supported"
 msgid "enable ssh support"
 msgstr "未被支持"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "未被支持"
 
@@ -478,7 +476,7 @@ msgstr ""
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -497,7 +495,7 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
@@ -509,18 +507,18 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意:没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’:%s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
@@ -655,7 +653,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -664,7 +662,7 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1681,7 +1679,7 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
@@ -1977,171 +1975,171 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s:无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 #, fuzzy
 msgid "make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "为某把密钥添加签名"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签名"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签名"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 #, fuzzy
 msgid "print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
@@ -2177,16 +2175,12 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 #, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2196,7 +2190,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2204,545 +2198,545 @@ msgstr ""
 "\n"
 "支持的算法:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "公钥:"
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "对称加密:"
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "散列:"
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "压缩:"
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "用法:gpg [选项] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告:用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告:配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告:扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告:用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告:配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告:扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意:一般情况下不会用到 %s!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d:无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d:无效的导入选项\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d:无效的导出选项\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d:无效的列表选项\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d:无效的校验选项\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d:无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告:程序可能会创建核心内存转储!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告:%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时,不能同时签名和加密\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败:%s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败:%s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败:%s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败:%s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败:%s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败:%s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败:%s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败:%s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败:%s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2936,7 +2930,6 @@ msgstr "密钥 %s:没有用户标识\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "“%s”已跳过:%s\n"
 
@@ -3066,7 +3059,6 @@ msgstr "密钥 %s:“%s”未改变\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "找不到私钥“%s”:%s\n"
 
@@ -3995,12 +3987,12 @@ msgid ""
 msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "已吊销"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "已过期"
 
@@ -4058,7 +4050,7 @@ msgstr "已经删除了 %d 个签名。\n"
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "无效"
 
@@ -5340,26 +5332,37 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告:“%s”选项已不建议使用\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "警告:“%s”选项已不建议使用\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "警告:“%s”选项已不建议使用\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -6064,7 +6067,6 @@ msgstr "注意:密钥已被吊销"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s 签名,散列算法 %s\n"
 
@@ -6462,7 +6464,7 @@ msgstr "绝对"
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
@@ -6477,46 +6479,46 @@ msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s:%s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任,%s 信任模型\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度:%d 有效性:%3d 已签名:%3d 信任度:%d-,%dq,%dn,%dm,%df,%du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 76fdb68..13a47cb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.0.17-git56b2bc2\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2014-08-12 20:30+0200\n"
+"POT-Creation-Date: 2014-11-13 19:19-0400\n"
 "PO-Revision-Date: 2013-04-24 19:34+0800\n"
 "Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -114,7 +114,7 @@ msgstr "密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1136
 #: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
 #: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
 #: g10/tdbio.c:554 jnlib/dotlock.c:310
@@ -124,7 +124,7 @@ msgstr "無法建立 `%s': %s\n"
 
 #: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
+#: g10/encode.c:504 g10/gpg.c:1137 g10/import.c:197 g10/keygen.c:2885
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
@@ -357,7 +357,7 @@ msgstr "以服務模式執行 (背景)"
 msgid "run in server mode (foreground)"
 msgstr "以伺服器模式執行 (前景)"
 
-#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:137 g10/gpg.c:497 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:166
 msgid "verbose"
@@ -427,7 +427,6 @@ msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
 
 #: agent/gpg-agent.c:189
 #, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "允許用戶端將金鑰標記為 \"已信任\""
 
@@ -437,13 +436,11 @@ msgstr "允許預先設定密語"
 
 #: agent/gpg-agent.c:193
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "啟用 ssh-agent 模擬"
 
 #: agent/gpg-agent.c:196
 #, fuzzy
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "未支援"
 
@@ -455,7 +452,7 @@ msgstr "|檔案|將環境設定也寫至「檔案」"
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
 #: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
-#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
+#: g10/gpg.c:829 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -473,7 +470,7 @@ msgstr ""
 "語法: gpg-agent [選項] [指令 [引數]]\n"
 "GnuPG 私鑰管理\n"
 
-#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1021 scd/scdaemon.c:328 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
@@ -485,18 +482,18 @@ msgstr "給定的除錯等級 `%s' 無效\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:764 g10/gpg.c:2129 scd/scdaemon.c:527 sm/gpgsm.c:1013
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2133
 #: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
+#: agent/gpg-agent.c:783 g10/gpg.c:2140 scd/scdaemon.c:540 sm/gpgsm.c:1024
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
@@ -629,7 +626,7 @@ msgstr ""
 "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
 "密碼快取維護\n"
 
-#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:382 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -638,7 +635,7 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:450 g10/gpgv.c:69 kbx/kbxutil.c:81
 #: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:159
 msgid ""
@@ -1619,7 +1616,7 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4064 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
@@ -1914,163 +1911,163 @@ msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:380 sm/gpgsm.c:188
+#: g10/gpg.c:384 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "建立簽章"
 
-#: g10/gpg.c:381 sm/gpgsm.c:189
+#: g10/gpg.c:385 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "建立明文簽章"
 
-#: g10/gpg.c:382 sm/gpgsm.c:190
+#: g10/gpg.c:386 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "建立分離式簽章"
 
-#: g10/gpg.c:383 sm/gpgsm.c:191
+#: g10/gpg.c:387 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:385 sm/gpgsm.c:192
+#: g10/gpg.c:389 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:387 sm/gpgsm.c:193
+#: g10/gpg.c:391 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:389 sm/gpgsm.c:194
+#: g10/gpg.c:393 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "驗證簽章"
 
-#: g10/gpg.c:391 sm/gpgsm.c:195
+#: g10/gpg.c:395 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:397
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:398
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:395 sm/gpgsm.c:200
+#: g10/gpg.c:399 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:396 sm/gpgsm.c:198
+#: g10/gpg.c:400 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:397 sm/gpgsm.c:201
+#: g10/gpg.c:401 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "產生新的金鑰對"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:402
 msgid "generate a revocation certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/gpg.c:400 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:406
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:407
 msgid "sign a key"
 msgstr "簽署金鑰"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:408
 msgid "sign a key locally"
 msgstr "僅在本機簽署金鑰"
 
-#: g10/gpg.c:405
+#: g10/gpg.c:409
 msgid "sign or edit a key"
 msgstr "簽署或編輯金鑰"
 
-#: g10/gpg.c:407 sm/gpgsm.c:215
+#: g10/gpg.c:411 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:413
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:410 sm/gpgsm.c:204
+#: g10/gpg.c:414 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至金鑰伺服器"
 
-#: g10/gpg.c:411 sm/gpgsm.c:205
+#: g10/gpg.c:415 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "從金鑰伺服器匯入金鑰"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:417
 msgid "search for keys on a key server"
 msgstr "在金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:419
 msgid "update all keys from a keyserver"
 msgstr "從金鑰伺服器更新所有的金鑰"
 
-#: g10/gpg.c:420
+#: g10/gpg.c:424
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:427
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:428
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:429
 msgid "change a card's PIN"
 msgstr "變更卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:434
+#: g10/gpg.c:438
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:441
+#: g10/gpg.c:445
 msgid "print message digests"
 msgstr "印出訊息摘要"
 
-#: g10/gpg.c:444 sm/gpgsm.c:210
+#: g10/gpg.c:448 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
-#: g10/gpg.c:448 sm/gpgsm.c:228
+#: g10/gpg.c:452 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|使用者-ID|以「使用者-ID」作為加密對象"
 
-#: g10/gpg.c:464 sm/gpgsm.c:278
+#: g10/gpg.c:468 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|使用者-ID|拿「使用者-ID」來簽署或解密"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:471
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:477
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:490 sm/gpgsm.c:280
+#: g10/gpg.c:494 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至「檔案」"
 
-#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:510 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:511
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
@@ -2106,11 +2103,11 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2120,7 +2117,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2128,543 +2125,543 @@ msgstr ""
 "\n"
 "已支援的演算法:\n"
 
-#: g10/gpg.c:859
+#: g10/gpg.c:868
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:866 g10/keyedit.c:2427
+#: g10/gpg.c:875 g10/keyedit.c:2427
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:873
+#: g10/gpg.c:882
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:880 g10/keyedit.c:2472
+#: g10/gpg.c:889 g10/keyedit.c:2472
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:949
+#: g10/gpg.c:958
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1181
+#: g10/gpg.c:1190
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1378
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1390
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1393
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1390
+#: g10/gpg.c:1399
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1393
+#: g10/gpg.c:1402
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1405
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1402
+#: g10/gpg.c:1411
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1405
+#: g10/gpg.c:1414
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1408
+#: g10/gpg.c:1417
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1414
+#: g10/gpg.c:1423
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1417
+#: g10/gpg.c:1426
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1429
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1600
+#: g10/gpg.c:1609
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1704
+#: g10/gpg.c:1713
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:1706
+#: g10/gpg.c:1715
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1717
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1719
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1723
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:1716
+#: g10/gpg.c:1725
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:1718
+#: g10/gpg.c:1727
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1729
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1731
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 
-#: g10/gpg.c:1724
+#: g10/gpg.c:1733
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈名稱"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1735
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期限"
 
-#: g10/gpg.c:1860
+#: g10/gpg.c:1869
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
 
-#: g10/gpg.c:1953
+#: g10/gpg.c:1962
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
+#: g10/gpg.c:2377 g10/gpg.c:3072 g10/gpg.c:3084
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2539 g10/gpg.c:2551
+#: g10/gpg.c:2561 g10/gpg.c:2573
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
+#: g10/gpg.c:2678 g10/gpg.c:2873 g10/keyedit.c:4201
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: g10/gpg.c:2668
+#: g10/gpg.c:2690
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2731
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:2711
+#: g10/gpg.c:2733
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:2713
+#: g10/gpg.c:2735
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:2715
+#: g10/gpg.c:2737
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2719
+#: g10/gpg.c:2741
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2743
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:2723
+#: g10/gpg.c:2745
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2725
+#: g10/gpg.c:2747
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:2727
+#: g10/gpg.c:2749
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
-#: g10/gpg.c:2729
+#: g10/gpg.c:2751
 msgid "validate signatures with PKA data"
 msgstr "以 PKA 資料驗證簽章"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2753
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提高對持有有效 PKA 資料之簽章的信任"
 
-#: g10/gpg.c:2738
+#: g10/gpg.c:2760
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2748
+#: g10/gpg.c:2770
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2934
+#: g10/gpg.c:2956
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2937
+#: g10/gpg.c:2959
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:3039 sm/gpgsm.c:1442
+#: g10/gpg.c:3061 sm/gpgsm.c:1442
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3065
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3052
+#: g10/gpg.c:3074
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允許跟 %s 併用!\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:3070
+#: g10/gpg.c:3092
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3106
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "你祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:3090
+#: g10/gpg.c:3112
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "你在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:3096
+#: g10/gpg.c:3118
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:3109
+#: g10/gpg.c:3131
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
+#: g10/gpg.c:3199 g10/gpg.c:3223 sm/gpgsm.c:1514
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
+#: g10/gpg.c:3205 g10/gpg.c:3229 sm/gpgsm.c:1520 sm/gpgsm.c:1526
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3189
+#: g10/gpg.c:3211
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3217
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3210
+#: g10/gpg.c:3232
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3234
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3236
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3238
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3240
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3243
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3247
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3254
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3236
+#: g10/gpg.c:3258
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3262
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3266
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3299
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3346
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 編密演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3329
+#: g10/gpg.c:3351
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 摘要演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3334
+#: g10/gpg.c:3356
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 壓縮演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3451
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3462
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3483
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3517
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3498
+#: g10/gpg.c:3520
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3516
+#: g10/gpg.c:3538
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3546
+#: g10/gpg.c:3568
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3549
+#: g10/gpg.c:3571
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3591
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr "--passwd 使用者ID"
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:3764
+#: g10/gpg.c:3786
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3837
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3823
+#: g10/gpg.c:3845
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3913
+#: g10/gpg.c:3935
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:4028
+#: g10/gpg.c:4050
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4054
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊息 ...\n"
 
-#: g10/gpg.c:4346
+#: g10/gpg.c:4368
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4348
+#: g10/gpg.c:4370
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4381
+#: g10/gpg.c:4403
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2856,7 +2853,6 @@ msgstr "金鑰 %s: 沒有使用者 ID\n"
 
 #: g10/import.c:804
 #, fuzzy, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "已跳過 \"%s\": %s\n"
 
@@ -2986,7 +2982,6 @@ msgstr "金鑰 %s: \"%s\" 未改變\n"
 
 #: g10/import.c:1205
 #, fuzzy, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
@@ -3922,12 +3917,12 @@ msgstr ""
 "除非你重新執行程式.\n"
 
 #: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
-#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
+#: g10/mainproc.c:1858 g10/trustdb.c:1240 g10/trustdb.c:1768
 msgid "revoked"
 msgstr "已撤銷"
 
 #: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
-#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1770
 msgid "expired"
 msgstr "已過期"
 
@@ -3986,7 +3981,7 @@ msgstr "已經刪除了 %d 份簽章.\n"
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:3359 g10/trustdb.c:1770
+#: g10/keyedit.c:3359 g10/trustdb.c:1772
 msgid "invalid"
 msgstr "無效"
 
@@ -5266,26 +5261,37 @@ msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s\" 是已廢棄的選項 - 沒有效果\n"
 
-#: g10/misc.c:910
+#: g10/misc.c:859
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
+
+#: g10/misc.c:863
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "警告: \"%s\" 是已廢棄的選項 - 沒有效果\n"
+
+#: g10/misc.c:924
 msgid "Uncompressed"
 msgstr "未壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:935
+#: g10/misc.c:949
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未壓縮|無"
 
-#: g10/misc.c:1062
+#: g10/misc.c:1076
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1237
+#: g10/misc.c:1251
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的 `%s' 選項\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1276
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的 `%s' 選項\n"
@@ -5996,7 +6002,6 @@ msgstr "請注意: 簽署金鑰 %s 已撤銷\n"
 
 #: g10/sig-check.c:280
 #, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
@@ -6393,7 +6398,7 @@ msgstr "徹底"
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:599 g10/trustdb.c:2521
+#: g10/trustdb.c:599 g10/trustdb.c:2523
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@ -6408,45 +6413,45 @@ msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:875 g10/trustdb.c:1344
+#: g10/trustdb.c:875 g10/trustdb.c:1346
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1079
+#: g10/trustdb.c:1081
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1083
+#: g10/trustdb.c:1085
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2266
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2331
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2343
+#: g10/trustdb.c:2345
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
 
-#: g10/trustdb.c:2366
+#: g10/trustdb.c:2368
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2452
+#: g10/trustdb.c:2454
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2527
+#: g10/trustdb.c:2529
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list