From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
Date: Thu, 13 Nov 2014 19:24:45 -0400
Subject: Update POT file

The 0001-warn-about-but-don-t-fail-on-scdaemon-options-in-gpg.patch
patch adds two new strings.
---
 po/gnupg2.pot | 405 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 208 insertions(+), 197 deletions(-)

diff --git a/po/gnupg2.pot b/po/gnupg2.pot
index f4136a4..610da27 100644
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.0.26\n"
+"Project-Id-Version: gnupg2 2.0.26\n"
 "Report-Msgid-Bugs-To: translations@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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -109,7 +109,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
@@ -119,7 +119,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
@@ -345,7 +345,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"
@@ -437,7 +437,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"
@@ -453,7 +453,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 ""
@@ -465,18 +465,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 ""
@@ -607,14 +607,14 @@ 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"
 " "
 msgstr ""
 
-#: 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 ""
@@ -1582,7 +1582,7 @@ msgstr ""
 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 ""
@@ -1876,163 +1876,163 @@ msgstr ""
 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
 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 ""
 
-#: g10/gpg.c:451 sm/gpgsm.c:241
+#: g10/gpg.c:455 sm/gpgsm.c:241
 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 ""
 
@@ -2058,560 +2058,560 @@ msgid ""
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 
-#: g10/gpg.c:842
+#: g10/gpg.c:851
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr ""
 
-#: g10/gpg.c:845
+#: g10/gpg.c:854
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: g10/gpg.c:856 sm/gpgsm.c:543
+#: g10/gpg.c:865 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/gpg.c:1163 sm/gpgsm.c:716
+#: g10/gpg.c:1172 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr ""
 
-#: 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
 #, 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
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr ""
 
-#: g10/gpg.c:2633
+#: g10/gpg.c:2655
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr ""
 
-#: 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
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:2671
+#: g10/gpg.c:2693
 msgid "invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2700
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2703
 msgid "invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:2688
+#: g10/gpg.c:2710
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2713
 msgid "invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:2698
+#: g10/gpg.c:2720
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:2701
+#: g10/gpg.c:2723
 msgid "invalid list options\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/gpg.c:2741
+#: g10/gpg.c:2763
 msgid "invalid verify options\n"
 msgstr ""
 
-#: 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
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3077
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr ""
 
-#: 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 ""
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3490
 msgid "--symmetric [filename]"
 msgstr ""
 
-#: g10/gpg.c:3470
+#: g10/gpg.c:3492
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3502
 msgid "--encrypt [filename]"
 msgstr ""
 
-#: g10/gpg.c:3493
+#: g10/gpg.c:3515
 msgid "--symmetric --encrypt [filename]"
 msgstr ""
 
-#: 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 ""
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3551
 msgid "--sign --encrypt [filename]"
 msgstr ""
 
-#: g10/gpg.c:3544
+#: g10/gpg.c:3566
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr ""
 
-#: 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 ""
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3600
 msgid "--clearsign [filename]"
 msgstr ""
 
-#: g10/gpg.c:3603
+#: g10/gpg.c:3625
 msgid "--decrypt [filename]"
 msgstr ""
 
-#: g10/gpg.c:3611
+#: g10/gpg.c:3633
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/gpg.c:3615
+#: g10/gpg.c:3637
 msgid "--lsign-key user-id"
 msgstr ""
 
-#: g10/gpg.c:3636
+#: g10/gpg.c:3658
 msgid "--edit-key user-id [commands]"
 msgstr ""
 
-#: g10/gpg.c:3652
+#: g10/gpg.c:3674
 msgid "--passwd <user-id>"
 msgstr ""
 
-#: g10/gpg.c:3739
+#: g10/gpg.c:3761
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3741
+#: g10/gpg.c:3763
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3743
+#: g10/gpg.c:3765
 #, c-format
 msgid "key export failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3754
+#: g10/gpg.c:3776
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -3835,12 +3835,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 ""
 
@@ -3895,7 +3895,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 ""
 
@@ -5133,26 +5133,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
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr ""
@@ -6230,7 +6241,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 ""
@@ -6245,45 +6256,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 ""
 
-#: 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 ""