summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--agent/ChangeLog4
-rw-r--r--doc/a-decade-of-gnupg.txt20
-rw-r--r--doc/help.de.txt6
-rw-r--r--doc/help.txt5
-rw-r--r--g10/ChangeLog6
-rw-r--r--g10/keygen.c25
-rw-r--r--po/be.po266
-rw-r--r--po/ca.po266
-rw-r--r--po/cs.po266
-rw-r--r--po/da.po266
-rw-r--r--po/de.po278
-rw-r--r--po/el.po266
-rw-r--r--po/eo.po266
-rw-r--r--po/es.po107
-rw-r--r--po/et.po266
-rw-r--r--po/fi.po266
-rw-r--r--po/fr.po266
-rw-r--r--po/gl.po266
-rw-r--r--po/hu.po266
-rw-r--r--po/id.po266
-rw-r--r--po/it.po266
-rw-r--r--po/ja.po266
-rw-r--r--po/nb.po266
-rw-r--r--po/pl.po267
-rw-r--r--po/pt.po266
-rw-r--r--po/pt_BR.po266
-rw-r--r--po/ro.po266
-rw-r--r--po/ru.po267
-rw-r--r--po/sk.po266
-rw-r--r--po/sv.po267
-rw-r--r--po/tr.po267
-rw-r--r--po/zh_CN.po266
-rw-r--r--po/zh_TW.po267
33 files changed, 3846 insertions, 3260 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 4d72a5a58..a60c85b71 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,7 +1,7 @@
2008-05-27 Werner Koch <wk@g10code.com>
- * trustlist.c (insert_colons): Fix stupidly wrong allocation
- computation.
+ * trustlist.c (insert_colons): Fix stupidly wrong allocation size
+ computation.
2008-05-26 Werner Koch <wk@g10code.com>
diff --git a/doc/a-decade-of-gnupg.txt b/doc/a-decade-of-gnupg.txt
index 7ab57a865..7d625dfc6 100644
--- a/doc/a-decade-of-gnupg.txt
+++ b/doc/a-decade-of-gnupg.txt
@@ -196,3 +196,23 @@ Happy Hacking,
[8] http://partners.nytimes.com/library/tech/99/11/cyber/articles/19encrypt.html
[9] http://www.heise.de/tp/r4/artikel/5/5124/1.html
+=== Remarks ===
+
+In a reply to this mail Alan Olsen remakrked on the ML:
+
+ MIT was forced to use the RSAREF library which had a non free
+ license. At first they used the RSAREF2 library, but then they were
+ told to use the RSAREF1 library. (I diffed the two libraries and
+ determined that the only difference was that RSAREF2 had fixed a
+ number of buffer overflows and other security flaws. There were no
+ added features.)
+
+ If I remember correctly, 2.5 had RSAREF2 and 2.6 had RSAREF1. One
+ of the main reasons for the creation of the "International version"
+ was the use of RSAREF. (Besides the security issues, it was pretty
+ damn slow. In the days of the i386 people cared about speed.)
+
+Jaime Suarez translated the text in his blog, see
+
+ http://wordpress.mundocripto.com
+
diff --git a/doc/help.de.txt b/doc/help.de.txt
index 4d8236ead..ea2a4e462 100644
--- a/doc/help.de.txt
+++ b/doc/help.de.txt
@@ -102,16 +102,18 @@ Geben Sie "ja" oder "nein" ein
.
.gpg.keygen.name
-Geben Sie den Namen des Schlüsselinhabers ein
+Geben Sie den Namen des Schlüsselinhabers ein.
+Beispiel: Heinrich Heine.
.
.gpg.keygen.email
Geben Sie eine Email-Adresse ein. Dies ist zwar nicht unbedingt notwendig,
aber sehr empfehlenswert.
+Beispiel: heinrichh@duesseldorf.de
.
.gpg.keygen.comment
-Geben Sie - bei Bedarf - einen Kommentar ein
+Geben Sie - bei Bedarf - einen Kommentar ein.
.
.gpg.keygen.userid.cmd
diff --git a/doc/help.txt b/doc/help.txt
index 4b8ec6277..a3322ee67 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -161,16 +161,19 @@ Answer "yes" or "no".
.gpg.keygen.name
-Enter the name of the key holder.
+Enter the name of the key holder.
+Example: Heinrich Heine
.
.gpg.keygen.email
Please enter an optional but highly suggested email address.
+Example: heinrichh@duesseldorf.de
.
.gpg.keygen.comment
Please enter an optional comment.
+In general there is no need for a comment.
.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 5e481bf66..af0ec7c00 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-31 Werner Koch <wk@g10code.com>
+
+ * keygen.c (ask_user_id): Change the string printed as header of
+ the user ID generation. Use code to not break existing
+ translations. Suggested by Eric Tetz.
+
2008-05-08 Werner Koch <wk@g10code.com>
* sig-check.c (do_check_messages): Print a revocation diagnostic
diff --git a/g10/keygen.c b/g10/keygen.c
index 48a7fa271..a89970003 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1941,12 +1941,31 @@ ask_user_id( int mode )
char *answer;
char *aname, *acomment, *amail, *uid;
- if( !mode )
- tty_printf( _("\n"
+ if ( !mode )
+ {
+ const char *s1 =
+ N_("\n"
+ "GnuPG needs to construct a user ID to identify your key.\n"
+ "\n");
+ const char *s2 = _(s1);
+
+ if (!strcmp (s1, s2))
+ {
+ /* There is no translation for the string thus we to use
+ the old info text. gettext has no way to tell whether
+ a translation is actually available, thus we need to
+ to compare again. */
+ const char *s3 = N_("\n"
"You need a user ID to identify your key; "
"the software constructs the user ID\n"
"from the Real Name, Comment and Email Address in this form:\n"
-" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n\n") );
+" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n\n");
+ const char *s4 = _(s3);
+ if (strcmp (s3, s4))
+ s2 = s3; /* A translation exists - use it. */
+ }
+ tty_printf ("%s", s2) ;
+ }
uid = aname = acomment = amail = NULL;
for(;;) {
char *p;
diff --git a/po/be.po b/po/be.po
index 48577a029..57ed908c8 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -91,8 +91,8 @@ msgstr "дрэнны пароль"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -101,7 +101,7 @@ msgstr ""
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -287,7 +287,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "шматслоўнасьць"
@@ -370,164 +370,164 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "запіс у stdout\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: тэчка створана\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, c-format
msgid "%s %s stopped\n"
msgstr ""
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr ""
@@ -637,7 +637,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -647,7 +647,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -659,19 +659,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "yes [так]"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -696,8 +696,8 @@ msgstr "дрэнны пароль"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
@@ -1094,7 +1094,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr ""
@@ -1688,7 +1688,7 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr ""
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1822,7 +1822,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1856,7 +1856,7 @@ msgstr ""
msgid "|FILE|write output to FILE"
msgstr ""
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "не рабіць ніякіх зьменаў"
@@ -3234,20 +3234,20 @@ msgstr "збой падпісаньня: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr ""
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr ""
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "сакрэтны ключ недаступны"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Ключ абаронены.\n"
@@ -3264,7 +3264,7 @@ msgstr ""
"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr ""
@@ -4021,12 +4021,12 @@ msgid "writing key binding signature\n"
msgstr ""
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr ""
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr ""
@@ -4226,7 +4226,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr ""
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4236,44 +4243,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr ""
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr ""
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr ""
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr ""
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr ""
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr ""
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr ""
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr ""
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr ""
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4281,7 +4288,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -4296,34 +4303,34 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr ""
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4331,7 +4338,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4339,91 +4346,91 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr ""
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr ""
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "запіс у stdout\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr ""
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr ""
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr ""
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -7340,7 +7347,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "паказаць ключы й адбіткі пальцаў"
@@ -7476,7 +7483,7 @@ msgstr ""
msgid "This is a qualified signature\n"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "quit [выйсьці]"
@@ -7520,46 +7527,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "пароль занадта доўгі\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "невядомая вэрсыя"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "памылка стварэньня \"%s\": %s\n"
@@ -7693,74 +7700,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "невядомая вэрсыя"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "невядомая вэрсыя"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "выкарыстоўваць у якасьці файла вываду"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "Выкарыстаньне: gpg [выбары] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "грамадскі ключ ня знойдзены"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "сакрэтны ключ недаступны"
diff --git a/po/ca.po b/po/ca.po
index 589b4d102..969461f88 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -113,8 +113,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -123,7 +123,7 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -313,7 +313,7 @@ msgstr ""
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detall"
@@ -400,166 +400,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "error en crear «%s»: %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "no es pot crear el directori «%s»: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "Certificat de revocació vàlid"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "error en crear «%s»: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: s'ha creat el directori\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: no s'ha pogut crear el directori: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "ha fallat l'actualització de la clau secreta: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
@@ -673,7 +673,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -683,7 +683,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -695,19 +695,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "sí|si"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -732,8 +732,8 @@ msgstr "canvia la contrasenya"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
@@ -1164,7 +1164,7 @@ msgstr ""
# Destès? ivb
# Desatès, sí. jm
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
@@ -1796,7 +1796,7 @@ 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:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1932,7 +1932,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1967,7 +1967,7 @@ msgstr "usa el mode de text canònic"
msgid "|FILE|write output to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "no fa cap canvi"
@@ -3441,20 +3441,20 @@ msgstr "Ha fallat el procés de signatura: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Aquesta clau no està protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "La clau està protegida.\n"
@@ -3471,7 +3471,7 @@ msgstr ""
"Introduïu la nova contrasenya per a la clau secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
@@ -4303,12 +4303,12 @@ msgid "writing key binding signature\n"
msgstr "s'està escrivint la signatura de comprovació de la clau\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -4528,7 +4528,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "És correcte? (s/n)"
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4545,44 +4552,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nom i cognoms: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "El nom no pot començar amb un dígit\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Adreça electrònica: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "No és una adreça vàlida\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Comentari: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Esteu usant el joc de caràcters `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4593,7 +4600,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
@@ -4610,23 +4617,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoXx"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Corregiu l'error primer\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4634,12 +4641,12 @@ msgstr ""
"Cal una contrasenya per a protegir la clau secreta.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4651,7 +4658,7 @@ msgstr ""
"useu aquest programa amb l'opció \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4663,53 +4670,53 @@ msgstr ""
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "La generació de claus ha estat cancel·lada.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "s'està escrivint la clau pública a «%s»\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
# Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
"no s'ha trobat cap anell secret de escrivible: %s\n"
"\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "s'han creat i signat les claus pública i secreta.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4718,13 +4725,13 @@ msgstr ""
"Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
"\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
# Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4733,7 +4740,7 @@ msgstr ""
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4741,26 +4748,26 @@ msgstr ""
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -7849,7 +7856,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@ -7988,7 +7995,7 @@ msgstr ""
"\n"
"Açò serà una autosignatura.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "ix"
@@ -8033,46 +8040,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "la línia és massa llarga\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -8206,74 +8213,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "fitxer d'eixida"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "forma d'ús: gpg [opcions] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "no s'ha trobat la clau pública"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
msgid "No argument allowed"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index fbc0a27e1..f6d3547cf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.3.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2004-11-26 09:12+0200\n"
"Last-Translator: Roman Pavlik <rp@tns.cz>\n"
"Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -94,8 +94,8 @@ msgstr "patn heslo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann algoritmus %d nen podporovn\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -104,7 +104,7 @@ msgstr "nemohu vytvoit `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -290,7 +290,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "s dodatenmi informacemi"
@@ -376,168 +376,168 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
"Chyby oznamte, prosm, na adresu <gnupg-bugs@gnu.org>.\n"
"Pipomnky k pekladu <rp@tns.cz>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Pouit: gpg [monosti] [soubory] (-h pro pomoc)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZNMKA: neexistuje implicitn soubor s monostmi `%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "soubor s monostmi `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "tu monosti z `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "chyba pi vytven `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nemohu vytvoit adres `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nemohu vytvoit `%s': %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nen v tomto sezen dostupn\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pi zskn novho PINu: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "chyba pi hledn zznamu dvryhodnosti v `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualizace selhala: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "adres `%s' vytvoen\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) selhal v %s: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "nemohu vytvoit adres `%s': %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pi ten `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aktualizace tajnho kle selhala: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: peskoeno: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nen v tomto sezen dostupn\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "patn formt promnn prosted GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent protokol verze %d nen podporovn\n"
@@ -650,7 +650,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -660,7 +660,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -672,19 +672,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "ano"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -709,8 +709,8 @@ msgstr "zmnit heslo"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba pi vytven hesla: %s\n"
@@ -1116,7 +1116,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Nalezena OpenPGP karta slo %s\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nelze provst v dvkovm mdu\n"
@@ -1702,7 +1702,7 @@ msgstr "pouvm podkl %s msto primrnho kle %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "kl %s: tajn kl bez kle veejnho - peskoeno\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1835,7 +1835,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1874,7 +1874,7 @@ msgstr "pout kanonick textov md"
msgid "|FILE|write output to FILE"
msgstr "tu monosti z `%s'\n"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "neprovdt dn zmny"
@@ -3312,19 +3312,19 @@ msgstr ""
"K dispozici je jen kontroln souet kle nebo je kl na kart - passphrase "
"nelze zmnit.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Tento kl nen chrnn.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn sti primrnho kle nejsou dostupn.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn st primrnho kle jsou uloeny na kart.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Kl je chrnn.\n"
@@ -3341,7 +3341,7 @@ msgstr ""
"Vlote nov heslo (passphrase) pro tento tajn kl.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nen zopakovno sprvn; zkuste to znovu"
@@ -4098,12 +4098,12 @@ msgid "writing key binding signature\n"
msgstr "zapisuji \"key-binding\" podpis\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn dlka kle; pouiji %u bit\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dlka kle zaokrouhlena na %u bit\n"
@@ -4316,7 +4316,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Je to sprvn (a/N)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4332,44 +4339,44 @@ msgstr ""
" \"Magda Prochazkova (student) <magda@domena.cz>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Jmno a pjmen: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Neplatn znak ve jmn\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Jmno neme zanat slic\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Jmno mus bt dlouh alespo 5 znak\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "E-mailov adresa: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Neplatn e-mailov adresa\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Koment: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Neplatn znak v komenti\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pouvte znakovou sadu `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4380,7 +4387,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do pole jmno nebo koment nepite, prosm, e-mailovou adresu.\n"
@@ -4395,25 +4402,25 @@ msgstr "Do pole jmno nebo koment nepite, prosm, e-mailovou adresu.\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "jJkKeEPpUu"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmnit (J)mno, (K)oment, (E)-mail nebo (U)konit? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmnit (J)mno, (K)oment, (E)-mail, (P)okraovat dl nebo (U)konit "
"program? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Nejdv, prosm, opravte chybu\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4421,12 +4428,12 @@ msgstr ""
"Pro ochranu Vaeho tajnho kle muste zadat heslo.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4438,7 +4445,7 @@ msgstr ""
"tohoto programu s parametrem \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4451,50 +4458,50 @@ msgstr ""
"pouvat disky); dky tomu m genertor lep anci zskat dostatek "
"entropie.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Vytven kle bylo zrueno.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuji veejn kl do `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovateln soubor veejnch kl (pubring): %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenalezen zapisovateln soubor tajnch kl (secring): %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pi zpisu do souboru veejnch kl `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pi zpisu do souboru tajnch kl `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "veejn a tajn kl byly vytvoeny a podepsny.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4502,12 +4509,12 @@ msgstr ""
"Tento kl neme bt pouit pro ifrovn. K vytvoen\n"
"sekundrnho kle pro tento el mete pout pkaz \"--edit-key\".\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoen kle se nepodailo: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4515,7 +4522,7 @@ msgstr ""
"kl byl vytvoen %lu sekund v budoucnosti (dolo ke zmn asu nebo\n"
"je problm se systmovm asem)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4523,25 +4530,25 @@ msgstr ""
"kl byl vytvoen %lu sekund v budoucnosti (dolo ke zmn asu nebo\n"
"je problm se systmovm asem)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZNMKA: vytvoen podkle pro kle v3 nen v souladu s OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Opravdu vytvoit? (a/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "uloen kle na kartu se nezdailo: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nemohu vytvoit zlohu souboru `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "POZNMKA: zloha kle z karty uloena do `%s'\n"
@@ -7526,7 +7533,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "chyba pi vytven hesla: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "chyba pi ten `%s': %s\n"
@@ -7663,7 +7670,7 @@ msgstr " alias \"%s\""
msgid "This is a qualified signature\n"
msgstr "Jedn se o podpis kle jm samm.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "ukonit"
@@ -7708,46 +7715,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "ten veejnho kle se nezdailo: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "dek je pli dlouh"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "neznm volba `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "podepsn selhalo: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "chyba pi ten `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "chyba pi hledn zznamu dvryhodnosti v `%s': %s\n"
@@ -7880,76 +7887,89 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
# c-format
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "neznm konfiguran poloka \"%s\"\n"
# c-format
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "neznm konfiguran poloka \"%s\"\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "pout jako vstupn soubor"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Pouit: gpg [monosti] [soubory] (-h pro pomoc)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "uit: gpg [monosti]"
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "veejn kl nenalezen"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "administrtorsk pkazy nejsou povoleny\n"
diff --git a/po/da.po b/po/da.po
index ff7901c98..d26187cbd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -92,8 +92,8 @@ msgstr "drlig kodestning"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "valgte cifferalgoritme %d er ugyldig\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
@@ -102,7 +102,7 @@ msgstr "kan ikke oprette %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -290,7 +290,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "meddelsom"
@@ -376,164 +376,164 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Rapportr venligst fejl til <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjlp)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "lser indstillinger fra `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, fuzzy, c-format
msgid "error creating `%s': %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: kan ikke oprette mappe: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "certifikatlseproblem: %s\n"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: mappe oprettet\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "kan ikke bne %s: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: kan ikke oprette mappe: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: udelod: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, fuzzy, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "valgte cifferalgoritme %d er ugyldig\n"
@@ -642,7 +642,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -652,7 +652,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -664,19 +664,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "ja"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -701,8 +701,8 @@ msgstr "ndr kodestningen"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
@@ -1104,7 +1104,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr ""
@@ -1708,7 +1708,7 @@ msgstr "bruger sekundr ngle %08lX istedetfor primr ngle %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "ngle %08lX: ikke en rfc2440 ngle - udeladt\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1846,7 +1846,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1881,7 +1881,7 @@ msgstr "brug kanonisk tekstmodus"
msgid "|FILE|write output to FILE"
msgstr "|FILE|indls udvidelsesmodul FILE"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "lav ingen ndringer"
@@ -3289,21 +3289,21 @@ msgstr "signering fejlede: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Denne ngle er ikke beskyttet.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Nglen er beskyttet.\n"
@@ -3318,7 +3318,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "kodestningen blev ikke ordentlig gentaget; prv igen.\n"
@@ -4114,12 +4114,12 @@ msgid "writing key binding signature\n"
msgstr ""
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nsket nglestrrelse er %u bit\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
@@ -4324,7 +4324,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/n)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4334,44 +4341,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Rigtige navn: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Navn m ikke starte med et tal\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal vre mindst 5 bogstaver langt\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruger '%s' tegnsttet.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4382,7 +4389,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -4397,24 +4404,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4422,12 +4429,12 @@ msgstr ""
"Du skal bruge en kodestning til at beskytte din hemmelige ngle.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4435,7 +4442,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4443,92 +4450,92 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Ngleoprettelse annulleret.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentligt certifikat til '%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ngle %08lX: offentlig ngle ikke fundet: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig ngle oprettet og signeret.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette?"
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "hemmelige ngler import: %lu\n"
@@ -7499,7 +7506,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "fejl ved oprettelse af kodestning: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
@@ -7638,7 +7645,7 @@ msgstr " alias \""
msgid "This is a qualified signature\n"
msgstr "skriver selvsignatur\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "afslut"
@@ -7683,46 +7690,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "ngle %08lX: ikke en rfc2440 ngle - udeladt\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "ukendt standard modtager '%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "fejl ved lsning af '%s': %s\n"
@@ -7857,74 +7864,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "ukendt standard modtager '%s'\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "ukendt standard modtager '%s'\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "brug som uddatafil"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hjlp)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "brug: gpg [flag] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "offentlig ngle ikke fundet"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "skriver hemmeligt certifikat til '%s'\n"
diff --git a/po/de.po b/po/de.po
index 8dd75e3df..1786aec85 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.6\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
-"PO-Revision-Date: 2008-05-09 11:21+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
+"PO-Revision-Date: 2008-05-31 12:56+0200\n"
"Last-Translator: Walter Koch <koch@u32.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -96,8 +96,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -106,7 +106,7 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -302,7 +302,7 @@ msgstr "Im Daemon Modus ausführen"
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "Detaillierte Informationen"
@@ -383,17 +383,17 @@ msgstr "Die ssh-agent-Emulation anschalten"
msgid "|FILE|write environment settings also to FILE"
msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Fehlerberichte bitte an <"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -401,145 +401,145 @@ msgstr ""
"Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für GnuPG\n"
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
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:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Fehler beim Erstellen von `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr "Der Name des Sockets ist zu lang\n"
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, c-format
msgid "can't create socket: %s\n"
msgstr "Socket kann nicht erzeugt werden: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "Der Name des Sockets `%s' ist zu lang\n"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
msgid "error getting nonce for the socket\n"
msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, c-format
msgid "listen() failed: %s\n"
msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, c-format
msgid "listening on socket `%s'\n"
msgstr "Es wird auf Socket `%s' gehört\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "Verzeichnis `%s' erzeugt\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr "Der gpg-agent läuft nicht für diese Session\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n"
@@ -657,7 +657,7 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -669,7 +669,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr "Korrekt"
@@ -681,7 +681,7 @@ msgstr "Korrekt"
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -690,11 +690,11 @@ msgstr ""
"Wenn Sie vollständiges Vertrauen haben, daß%%0A \"%s\"%%"
"0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "Yes"
msgstr "Ja"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr "Nein"
@@ -722,8 +722,8 @@ msgstr "Die Passphrase ändern"
msgid "I'll change it later"
msgstr "Ich werde sie später ändern"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
@@ -1108,7 +1108,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP Karte Nr. %s erkannt\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
@@ -1706,7 +1706,7 @@ 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:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1839,7 +1839,7 @@ msgid "run in server mode"
msgstr "Im Server Modus ausführen"
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1873,7 +1873,7 @@ msgstr "Textmodus benutzen"
msgid "|FILE|write output to FILE"
msgstr "|DATEI|Ausgabe auf DATEI schreiben"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
@@ -3322,22 +3322,22 @@ msgstr "Beglaubigung fehlgeschlagen: %s\n"
#: g10/keyedit.c:1131
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- keine "
-"Passphrase ist zu ändern.\n"
+"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
+"keine Passphrase ist zu ändern.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Dieser Schlüssel ist nicht geschützt.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Geheime Teile des Haupschlüssels sind auf der Karte gespeichert.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Schlüssel ist geschützt.\n"
@@ -3354,7 +3354,7 @@ msgstr ""
"Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
@@ -3648,7 +3648,8 @@ msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) "
#: g10/keyedit.c:2046
msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
+msgstr ""
+"Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
#: g10/keyedit.c:2048
msgid "Do you really want to revoke this subkey? (y/N) "
@@ -4126,12 +4127,12 @@ msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
@@ -4346,7 +4347,17 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ist dies richtig? (j/N) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+"\n"
+"GnuPG erstellt eine User-ID um Ihren Schlüssel identifizierbar zu machen.\n"
+"\n"
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4362,44 +4373,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Ungültiges Zeichen im Namen\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Email-Adresse: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Diese Email-Adresse ist ungültig\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Ungültiges Zeichen im Kommentar.\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4410,7 +4421,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
@@ -4425,23 +4436,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfBb"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4449,12 +4460,12 @@ msgstr ""
"Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4467,7 +4478,7 @@ msgstr ""
"aufrufen.\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4478,50 +4489,50 @@ msgstr ""
"unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4530,12 +4541,12 @@ msgstr ""
"werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n"
"Unterschlüssel für diesem Zweck erzeugen.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4543,7 +4554,7 @@ msgstr ""
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4551,25 +4562,25 @@ msgstr ""
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? (j/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
@@ -7566,7 +7577,7 @@ msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
msgid "error importing certificate: %s\n"
msgstr "Fehler beim Importieren des Zertifikats: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, c-format
msgid "error reading input: %s\n"
msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@ -7713,7 +7724,7 @@ msgstr " alias"
msgid "This is a qualified signature\n"
msgstr "Dies ist eine qualifizierte Unterschrift.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
msgid "quiet"
msgstr "Reduzierte Informationen"
@@ -7757,45 +7768,45 @@ msgstr ""
"Syntax: gpg-connect-agent [Optionen]\n"
"Mit einem laufenden Agenten verbinden und Befehle senden\n"
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr "Option \"%s\" erfordert ein Programm und evtl. Argumente\n"
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "Option \"%s\" wird wegen \"%s\" nicht beachtet\n"
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, c-format
msgid "receiving line failed: %s\n"
msgstr "Empfangen der Zeile schlug fehl: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
msgid "line too long - skipped\n"
msgstr "Zeile zu lang - übersprungen\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr "Zeile wegen enthaltenem Nul-Zeichen gekürzt\n"
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, c-format
msgid "unknown command `%s'\n"
msgstr "unbekannter Befehl `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, c-format
msgid "sending line failed: %s\n"
msgstr "Senden der Zeile schlug fehl: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, c-format
msgid "error sending %s command: %s\n"
msgstr "Fehler beim Senden des %s-Befehls: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, c-format
msgid "error sending standard options: %s\n"
msgstr "Fehler beim Senden der Standardoptionen: %s\n"
@@ -7926,51 +7937,64 @@ msgstr "Liste der LDAP Server"
msgid "Configuration for OCSP"
msgstr "Konfiguration zu OCSP"
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr "Liste aller Komponenten"
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr "Prüfe alle Programme"
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr "|KOMPONENTE|Zeige die Optionen an"
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr "|KOMPONENTE|Ändere die Optionen"
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr "|KOMPONENTE|Prüfe die Optionen"
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr "Wende die gobalen Voreinstellungen an"
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr "Hole die Einstelungsverzeichnisse von gpgconf"
+
+#: tools/gpgconf.c:70
msgid "list global configuration file"
msgstr "Zeige die globale Konfigurationsdatei an"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
msgid "check global configuration file"
msgstr "Prüfe die globale Konfigurationsdatei"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Aufruf: gpgconf [Optionen] (-h für Hilfe)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
@@ -7978,19 +8002,19 @@ msgstr ""
"Syntax: gpgconf {Optionen]\n"
"Verwalte Konfigurationsoptionen für Programme des GnuPG Systems\n"
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
msgid "usage: gpgconf [options] "
msgstr "Aufruf: gpgconf [Optionen] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr "Benötige ein Komponentenargument"
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
msgid "Component not found"
msgstr "Komponente nicht gefunden"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
msgid "No argument allowed"
msgstr "Argumente sind nicht erlaubt"
diff --git a/po/el.po b/po/el.po
index 4c5a601ff..345efe82d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -92,8 +92,8 @@ msgstr " "
msgid "ssh keys greater than %d bits are not supported\n"
msgstr " %d%s\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -102,7 +102,7 @@ msgstr " `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -288,7 +288,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr ""
@@ -375,166 +375,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr " <gnupg-bugs@gnu.org>\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr ": gpg [] [] (-h )"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ": `%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr " `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr " %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr " gpg-agent \n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr " : %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr " : %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr " `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: \n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: : %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr " `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr " : %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: : %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr " gpg-agent \n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr " GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr " %d gpg-agent\n"
@@ -647,7 +647,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -657,7 +657,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -669,19 +669,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "|"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -706,8 +706,8 @@ msgstr " "
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr " : %s\n"
@@ -1116,7 +1116,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr " (batchmode)\n"
@@ -1745,7 +1745,7 @@ msgstr " %08lX %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr " %08lX: - \n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1879,7 +1879,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1914,7 +1914,7 @@ msgstr " "
msgid "|FILE|write output to FILE"
msgstr "|| "
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr " "
@@ -3377,20 +3377,20 @@ msgstr " : %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr " .\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr " .\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr " .\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr " .\n"
@@ -3407,7 +3407,7 @@ msgstr ""
" .\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr " . "
@@ -4219,12 +4219,12 @@ msgid "writing key binding signature\n"
msgstr " \"\" \n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr " , %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr " %u bits\n"
@@ -4442,7 +4442,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr " (y/n); "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4459,44 +4466,44 @@ msgstr ""
" \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr " : "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr " \n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr " \n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr " 5 \n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr " Email: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr " Email\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr ": "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr " \n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr " `%s' .\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4507,7 +4514,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr " email \n"
@@ -4522,23 +4529,23 @@ msgstr " email \n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr " (N), (C), (E)mail (Q); "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr " (N), (C), (E)mail (O)/(Q); "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr ", \n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4546,12 +4553,12 @@ msgstr ""
" .\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4563,7 +4570,7 @@ msgstr ""
" , \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4575,50 +4582,50 @@ msgstr ""
" ) . \n"
" .\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr " .\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr " .\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4629,12 +4636,12 @@ msgstr ""
" \"--edit-key\" \n"
" .\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4642,7 +4649,7 @@ msgstr ""
" %lu ( \n"
" )\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4650,28 +4657,28 @@ msgstr ""
" %lu ( \n"
" )\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
": v3 \n"
" OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr " ; "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr " block : %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ": %08lX %s\n"
@@ -7695,7 +7702,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr " : %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr " `%s': %s\n"
@@ -7834,7 +7841,7 @@ msgstr ""
"\n"
" -.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr ""
@@ -7879,46 +7886,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr " block : %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr " \n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr " `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr " : %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr " `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr " `%s': %s\n"
@@ -8052,74 +8059,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr " \"%s\"\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr " \"%s\"\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr " "
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr ": gpg [] [] (-h )"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr ": gpg [] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr " "
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr " `%s'\n"
diff --git a/po/eo.po b/po/eo.po
index 9c12baea7..e1a1c259b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -92,8 +92,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -102,7 +102,7 @@ msgstr "ne povas krei '%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -289,7 +289,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detala eligo"
@@ -375,166 +375,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ne povas krei %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "Valida atestilrevoko"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ne estas disponata en i tiu sesio\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: dosierujo kreita\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu losiloj ignoritaj\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ne estas disponata en i tiu sesio\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
@@ -647,7 +647,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -657,7 +657,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -669,19 +669,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "jes"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -706,8 +706,8 @@ msgstr "ani la pasfrazon"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -1123,7 +1123,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga reimo\n"
@@ -1733,7 +1733,7 @@ msgstr "uzas flankan losilon %08lX anstata la efa losilo %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "losilo %08lX: sekreta losilo sen publika losilo - ignorita\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1867,7 +1867,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1902,7 +1902,7 @@ msgstr "uzi tekstan reimon"
msgid "|FILE|write output to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "fari neniajn anojn"
@@ -3365,20 +3365,20 @@ msgstr "subskribado malsukcesis: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "i tiu losilo ne estas protektita.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de efa losilo ne estas disponataj.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Sekretaj partoj de efa losilo ne estas disponataj.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "losilo estas protektita.\n"
@@ -3395,7 +3395,7 @@ msgstr ""
"Donu la novan pasfrazon por i tiu sekreta losilo.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "la pasfrazo ne estis uste ripetita; provu denove"
@@ -4198,12 +4198,12 @@ msgid "writing key binding signature\n"
msgstr "skribas losilbindan subskribon\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "losilgrando nevalida; uzas %u bitojn\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "losilgrando rondigita is %u bitoj\n"
@@ -4421,7 +4421,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "u tio estas usta (j/n)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4437,44 +4444,44 @@ msgstr ""
" \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Vera nomo: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komencii per cifero\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena 5 signojn\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Retadreso: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Komento: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4485,7 +4492,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bonvolu ne meti la retadreson en la veran nomon a la komenton\n"
@@ -4500,23 +4507,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a la komenton\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "anu (N)omon, (K)omenton, (A)adreson, a (F)ini? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "anu (N)omon, (K)omenton, (A)adreson, a (B)one/(F)ini? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4524,12 +4531,12 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan losilon.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4541,7 +4548,7 @@ msgstr ""
"uzante i tiun programon kun la opcio \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4553,50 +4560,50 @@ msgstr ""
"kreado de la primoj; tio donas al la stokastilo pli bonan ancon\n"
"akiri sufie da entropio.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Kreado de losiloj nuligita.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skribas publikan losilon al '%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika losilaro trovita: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "neniu skribebla sekreta losilaro trovita: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eraro dum skribado de publika losilaro '%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eraro dum skribado de sekreta losilaro '%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta losiloj kreitaj kaj subskribitaj.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4605,12 +4612,12 @@ msgstr ""
"Notu, ke i tiu losilo ne estas uzebla por ifrado. Vi eble volos\n"
"uzi la komandon \"--edit-key\" por krei flankan losilon por tiu celo.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4618,7 +4625,7 @@ msgstr ""
"losilo estis kreita %lu sekundon en la estonteco (tempotordo a "
"horloeraro)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4626,26 +4633,26 @@ msgstr ""
"losilo estis kreita %lu sekundojn en la estonteco (tempotordo a "
"horloeraro)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTO: krei sublosilojn por v3-losiloj ne estas OpenPGP-kongrue\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "u vere krei? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTO: sekreta losilo %08lX eksvalidiis je %s\n"
@@ -7662,7 +7669,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@ -7799,7 +7806,7 @@ msgstr " alinome \""
msgid "This is a qualified signature\n"
msgstr "tio povas esti kazata de mankanta mem-subskribo\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "fini"
@@ -7844,46 +7851,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "pasfrazo estas tro longa\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
@@ -8017,74 +8024,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "%s: nova opcio-dosiero kreita\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "%s: nova opcio-dosiero kreita\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "uzi dosieron por eligo"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "uzado: gpg [opcioj] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "publika losilo ne trovita"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "skribas sekretan losilon al '%s'\n"
diff --git a/po/es.po b/po/es.po
index c463e4f38..e31fc5fc1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-27 13:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2008-05-27 22:38+0100\n"
"Last-Translator: Jaime Surez <jaime@mundocripto.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -111,8 +111,8 @@ msgstr "Frase contrasea"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de ms de %d bits\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -121,7 +121,7 @@ msgstr "no se puede crear %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -1124,7 +1124,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "tarjeta OpenPGP num. %s detectada\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
@@ -3298,19 +3298,19 @@ msgstr ""
"La clave tiene slo un apuntador u objetos de clave en la propia tarjeta\n"
"- no hay frase contrasea que cambiar.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Esta clave no est protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Las partes secretas de la clave primaria no estn disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "La clave est protegida.\n"
@@ -3327,7 +3327,7 @@ msgstr ""
"Introduzca la nueva frase contrasea para esta clave secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "frase contrasea repetida incorrectamente; intntelo de nuevo"
@@ -4077,12 +4077,12 @@ msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobacin de clave\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamao de clave incorrecto; se usarn %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamao de clave redondeado a %u bits\n"
@@ -4297,7 +4297,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Es correcto? (s/n) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4313,44 +4320,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nombre y apellidos: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Caracter invlido en el nombre\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un nmero\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Direccin de correo electrnico: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Direccin invlida\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Caracter invlido en el comentario\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est usando el juego de caracteres `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4361,7 +4368,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no ponga la direccin de correo-e en el nombre real o en el "
@@ -4378,23 +4385,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Cambia (N)ombre, (C)omentario, (D)ireccin o (S)alir? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Cambia (N)ombre, (C)omentario, (D)ireccin o (V)ale/(S)alir? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Por favor corrija primero el error.\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4402,12 +4409,12 @@ msgstr ""
"Necesita una frase contrasea para proteger su clave secreta.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4419,7 +4426,7 @@ msgstr ""
"la opcin \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4432,50 +4439,50 @@ msgstr ""
"generador de nmeros aleatorios mayor oportunidad de recoger suficiente\n"
"entropa.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Creacin de claves cancelada.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "escribiendo clave pblica en `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escribiendo apuntador de la clave privada en `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "escribiendo clave privada en `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo pblico de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "anillo privado de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error escribiendo anillo pblico `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "claves pblica y secreta creadas y firmadas.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4483,12 +4490,12 @@ msgstr ""
"Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
"la orden \"--edit-key\" para crear una subclave con este propsito.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creacin de la clave fallida: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4496,7 +4503,7 @@ msgstr ""
"clave pblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4504,25 +4511,25 @@ msgstr ""
"clave pblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaves para claves V3 no sigue el estndar OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Crear de verdad? (s/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "almacenado de clave en la tarjeta fallido: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "no se puede crear fichero de respaldo `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
diff --git a/po/et.po b/po/et.po
index c2f80200a..6c844fb07 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -92,8 +92,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -102,7 +102,7 @@ msgstr "`%s' ei nnestu luua: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -288,7 +288,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "ole jutukas"
@@ -374,166 +374,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Kasuta: gpg [vtmed] [failid] (-h nitab abiinfot)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MRKUS: vaikimisi vtmete fail `%s' puudub\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "vtmete fail `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen vtmeid failist `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "viga `%s' loomisel: %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "kataloogi `%s' ei nnestu luua: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s ei nnestu luua: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "viga parooli loomisel: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "uuendamine ebannestus: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: kataloog on loodud\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: lugemine ebannestus (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: kataloogi ei nnestu luua: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "salajase vtme uuendamine ebannestus: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: jtsin vahele: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
@@ -646,7 +646,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -656,7 +656,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -668,19 +668,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "jah"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -705,8 +705,8 @@ msgstr "muuda parooli"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@ -1114,7 +1114,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
@@ -1736,7 +1736,7 @@ msgstr "kasutan sekundaarset vtit %08lX primaarse vtme %08lX asemel\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "vti %08lX: salajane vti avaliku vtmeta - jtsin vahele\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1870,7 +1870,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1905,7 +1905,7 @@ msgstr "kasuta kanoonilist tekstimoodi"
msgid "|FILE|write output to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "ra tee mingeid muutusi"
@@ -3347,20 +3347,20 @@ msgstr "allkirjastamine ebannestus: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "See vti ei ole kaitstud.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse vtme salajased komponendid ei ole kttesaadavad.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Primaarse vtme salajased komponendid ei ole kttesaadavad.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Vti on kaitstud.\n"
@@ -3377,7 +3377,7 @@ msgstr ""
"Sisestage sellele salajasele vtmele uus parool.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "parooli ei korratud ieti; proovige uuesti"
@@ -4176,12 +4176,12 @@ msgid "writing key binding signature\n"
msgstr "kirjutan vtit siduva allkirja\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane vtme suurus; kasutan %u bitti\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "vtme suurus mardatud les %u bitini\n"
@@ -4399,7 +4399,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "On see ige (j/e)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4415,44 +4422,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Prisnimi: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Lubamatu smbol nimes\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Nimi ei vi alata numbriga\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema vhemalt 5 smbolit\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "E-posti aadress: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Lubamatu smbol kommentaaris\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4463,7 +4470,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "rge palun kirjutage e-posti aadressi prisnimesse ega kommentaari\n"
@@ -4478,23 +4485,23 @@ msgstr "rge palun kirjutage e-posti aadressi prisnimesse ega kommentaari\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti vi (V)lju? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti vi (O)k/(V)lju? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Palun parandage kigepealt viga\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4502,12 +4509,12 @@ msgstr ""
"Te vajate oma salajase vtme kaitsmiseks parooli.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4519,7 +4526,7 @@ msgstr ""
"kasutades seda programmi vtmega \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4531,50 +4538,50 @@ msgstr ""
"kasutada kettaid jne), see annaks juhuarvude generaatorile vimaluse\n"
"koguda paremat entroopiat.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Vtme genereerimine katkestati.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjutan avaliku vtme faili `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike vtmete hoidlat pole: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjutatavat salajaste vtmete hoidlat pole: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "viga avaliku vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "viga salajase vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane vti on loodud ja allkirjastatud.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4584,43 +4591,43 @@ msgstr ""
"Krptimiseks tuleb genereerida teine vti, seda saate teha\n"
"kasutades vtit \"--edit-key\".\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vtme genereerimine ebannestus: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "vti loodi %lu sekund tulevikus (ajahpe vi kella probleem)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "vti loodi %lu sekundit tulevikus (ajahpe vi kella probleem)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "MRKUS: v3 vtmetele alamvtmete loomine ei ole OpenPGP hilduv\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon testi? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "`%s' ei nnestu luua: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "MRKUS: salajane vti %08lX aegus %s\n"
@@ -7615,7 +7622,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "viga parooli loomisel: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@ -7754,7 +7761,7 @@ msgstr ""
"\n"
"See saab olema iseenda allkiri.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "vlju"
@@ -7799,46 +7806,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "rida on liiga pikk\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "allkirjastamine ebannestus: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -7972,74 +7979,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "tundmatu seade \"%s\"\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "tundmatu seade \"%s\"\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "kasuta vljundfailina"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Kasuta: gpg [vtmed] [failid] (-h nitab abiinfot)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "kasuta: gpg [vtmed] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "ei leia avalikku vtit"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "kirjutan salajase vtme faili `%s'\n"
diff --git a/po/fi.po b/po/fi.po
index 20ff3cc33..ea52a845b 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -108,8 +108,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -118,7 +118,7 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -304,7 +304,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "monisanainen"
@@ -390,167 +390,167 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: hakemisto luotu\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
@@ -663,7 +663,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -673,7 +673,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -685,19 +685,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "kyllä|kylla|joo"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -722,8 +722,8 @@ msgstr "muuta salasanaa"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@ -1133,7 +1133,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
@@ -1755,7 +1755,7 @@ msgstr ""
"avain %08lX: salaisella avaimella ei ole vastaavaa \n"
"julkista avainta - ohitetaan\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1889,7 +1889,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1924,7 +1924,7 @@ msgstr "käytä tekstimuotoa"
msgid "|FILE|write output to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "älä tee muutoksia"
@@ -3374,20 +3374,20 @@ msgstr "allekirjoitus epäonnistui: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Avainta ei ole suojattu.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Avain on suojattu.\n"
@@ -3404,7 +3404,7 @@ msgstr ""
"Syötä uusi salasana salaiselle avaimelle.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
@@ -4208,12 +4208,12 @@ msgid "writing key binding signature\n"
msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -4431,7 +4431,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Onko tämä oikein (k/e) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4449,44 +4456,44 @@ msgstr ""
" \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Oikea nimi: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Nimessä on epäkelpo merkki\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Nimi ei voi alkaa numerolla\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Sähköpostiosoite: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Huomautus: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Huomautuksessa on epäkelpo merkki\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Käytät merkistöä \"%s\".\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4497,7 +4504,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
@@ -4512,23 +4519,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnHhSsOoLl"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Ole hyvä ja korjaa ensin virhe\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4536,12 +4543,12 @@ msgstr ""
"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4553,7 +4560,7 @@ msgstr ""
"tämän ohjelman valitsimella \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4565,50 +4572,50 @@ msgstr ""
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4617,12 +4624,12 @@ msgstr ""
"Huomaa, että tätä avainta ei voida käyttää salaamiseen. Käytä komentoa\n"
"\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4630,7 +4637,7 @@ msgstr ""
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4638,26 +4645,26 @@ msgstr ""
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -7681,7 +7688,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7820,7 +7827,7 @@ msgstr ""
"\n"
"Tämä tulee olemaan oma-allekirjoitus.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "lopeta|sulje"
@@ -7865,46 +7872,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "rivi on liian pitkä\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -8038,74 +8045,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "tuntematon asetus \"%s\"\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "tuntematon asetus \"%s\"\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "käytä tulostustiedostona"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "käyttö: gpg [valitsimet] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "julkista avainta ei löydy"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
diff --git a/po/fr.po b/po/fr.po
index a3bcf884f..9904e981f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2005-06-28 00:24+0200\n"
"Last-Translator: Gal Quri <gael@lautre.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -98,8 +98,8 @@ msgstr "mauvaise phrase de passe"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "le hachage de protection %d n'est pas support\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -108,7 +108,7 @@ msgstr "impossible de crer `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -300,7 +300,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "bavard"
@@ -388,170 +388,170 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
"Signaler toutes anomalies <gnupg-bugs@gnu.org> (en anglais)\n"
"et tout problme de traduction <traduc@traduc.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: pas de fichier d'options par dfaut `%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erreur pendant la cration de `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "impossible de crer le rpertoire `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossible de crer `%s': %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent n'est pas disponible dans cette session\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr ""
"erreur pendant la recherche de l'enregistrement de confiance\n"
"dans `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "la mise jour a chou: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "criture de la cl secrte dans `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "rpertoire `%s' cr\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) chou dans %s: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "impossible de crer le rpertoire `%s': %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "la mise jour de la cl secrte a chou: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignor: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent n'est pas disponible dans cette session\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "la variable d'environnement GPG_AGENT_INFO est mal dfinie\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "le protocole gpg-agent version %d n'est pas support\n"
@@ -664,7 +664,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -674,7 +674,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -686,19 +686,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "oui"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -723,8 +723,8 @@ msgstr "changer la phrase de passe"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erreur pendant la cration de la phrase de passe: %s\n"
@@ -1135,7 +1135,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "carte OpenPGP n %s dtecte\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
@@ -1744,7 +1744,7 @@ msgstr ""
msgid "key %s: secret key without public key - skipped\n"
msgstr "cl %s: cl secrte sans cl publique - non prise en compte\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1877,7 +1877,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1912,7 +1912,7 @@ msgstr "utiliser le mode texte canonique"
msgid "|FILE|write output to FILE"
msgstr "lire les options de `%s'\n"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "ne rien changer"
@@ -3382,21 +3382,21 @@ msgstr ""
"La cl possde seulement des items partiels ou stocks sur carte -\n"
"pas de phrase de passe changer.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Cette cl n'est pas protge.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parties secrtes de la cl principale ne sont pas disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr ""
"Les parties secrtes de la cl principale sont stockes sur la\n"
"carte.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "La cl est protge.\n"
@@ -3411,7 +3411,7 @@ msgid ""
"\n"
msgstr "Entrez la nouvelle phrase de passe pour cette cl secrte.\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "la phrase de passe n'a pas t correctement rpte ; recommencez."
@@ -4206,12 +4206,12 @@ msgid "writing key binding signature\n"
msgstr "criture de la signature de liaison\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Taille invalide; utilisation de %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie %u bits\n"
@@ -4424,7 +4424,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est-ce correct ? (o/N) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4440,44 +4447,44 @@ msgstr ""
" Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> \n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nom rel: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Caractre invalide dans le nom\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Le nom doit faire au moins 5 caractres de long\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Adresse e-mail: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse e-mail valide\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Commentaire: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Caractre invalide dans le commentaire\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vous utilisez le jeu de caractres '%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4488,7 +4495,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Ne mettez pas d'adresse e-mail dans le nom rel ou dans le commentaire\n"
@@ -4504,23 +4511,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Corrigez l'erreur d'abord\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4529,12 +4536,12 @@ msgstr ""
"secrte.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4548,7 +4555,7 @@ msgstr ""
" --edit-key .\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4560,52 +4567,52 @@ msgstr ""
"pendant la gnration de nombres premiers; cela donne au gnrateur de\n"
"nombres alatoires une meilleure chance d'avoir assez d'entropie.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "La gnration de cl a t annule.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "criture de la cl publique dans `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "criture d'une cl secrte partielle dans `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "criture de la cl secrte dans `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
"aucun portes-cls public n'a t trouv avec des droits d'criture : %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
"aucun portes-cls secret n'a t trouv avec des droits d'criture : %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erreur durant l'criture du porte-cls public `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erreur durant l'criture du porte-cls secret `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "les cls publique et secrte ont t cres et signes.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4614,13 +4621,13 @@ msgstr ""
"utiliser la commande --edit-key pour gnrer une sous-cl \n"
"cette fin.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La gnration de cl a chou: %s\n"
# on s'amuse comme on peut...
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4628,7 +4635,7 @@ msgstr ""
"la cl a t cre %lu seconde dans le futur (rupture spatio-temporelle ou\n"
"problme d'horloge)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4636,26 +4643,26 @@ msgstr ""
"la cl a t cre %lu secondes dans le futur (rupture spatio-temporelle ou\n"
"problme d'horloge\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"NOTE: crer des sous-cls pour des cls v3 n'est pas conforme OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Crer vraiment ? (o/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "le stockage de la cl dans la carte a chou: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossible de crer le fichier de sauvegarde `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTE: sauvegarde de la cl de la carte dans `%s'\n"
@@ -7715,7 +7722,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "erreur pendant la cration de la phrase de passe: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -7858,7 +7865,7 @@ msgstr " alias %s "
msgid "This is a qualified signature\n"
msgstr "Ceci sera une auto-signature.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "quitter"
@@ -7903,46 +7910,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "la lecture de la cl publique a chou: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "ligne trop longue"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "option `%s' inconnue\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "la signature a chou: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr ""
@@ -8077,74 +8084,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "lment de configuration `%s' inconnu\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "lment de configuration `%s' inconnu\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "utilisation: gpg [options] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "cl publique non trouve"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "Les commandes d'administration ne sont pas permises\n"
diff --git a/po/gl.po b/po/gl.po
index a65ef0a4f..b99a3a909 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -92,8 +92,8 @@ msgstr "contrasinal errneo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "o algoritmo de proteccin %d%s non est soportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -102,7 +102,7 @@ msgstr "non se pode crear `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -289,7 +289,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "lareto"
@@ -377,168 +377,168 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
"Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
"e dos erros na traduccin a <proxecto@trasno.net>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg [opcins] [ficheiros] (-h para ve-la axuda)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: non existe o ficheiro de opcins por defecto `%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opcins `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo as opcins de `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erro ao crear `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "non se pode crea-lo directorio `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "non foi posible crear %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "Revocacin de certificado vlida"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent non est dispoible nesta sesin\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "a actualizacin fallou: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directorio creado\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: non foi posible crear un directorio: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro lendo `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "o segredo da actualizacin fallou: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non est dispoible nesta sesin\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "a versin %d do protocolo de gpg-agent non est soportada\n"
@@ -651,7 +651,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -661,7 +661,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -673,19 +673,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "si|sim"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -710,8 +710,8 @@ msgstr "cambia-lo contrasinal"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -1124,7 +1124,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
@@ -1748,7 +1748,7 @@ msgstr "emprgase a chave secundaria %08lX no canto da primaria %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sen chave pblica - omitida\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1882,7 +1882,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1917,7 +1917,7 @@ msgstr "usar modo de texto cannico"
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carga-lo mdulo de extensin FICHEIRO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "non facer ningn cambio"
@@ -3373,20 +3373,20 @@ msgstr "fallou a sinatura: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Esta chave non est protexida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "as partes secretas da chave primaria non estn dispoibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "as partes secretas da chave primaria non estn dispoibles.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "A chave est protexida.\n"
@@ -3403,7 +3403,7 @@ msgstr ""
"Introduza o novo contrasinal para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; tnteo de novo"
@@ -4221,12 +4221,12 @@ msgid "writing key binding signature\n"
msgstr "escribindo unha sinatura que liga a chave\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamao de chave non vlido; empregando %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamao de chave redondeado a %u bits\n"
@@ -4444,7 +4444,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Isto correcto? (s/n) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4461,44 +4468,44 @@ msgstr ""
" \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nome: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Caracter non vlido no nome\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "O nome non pode comezar cun dxito\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "O nome debe ter alomenos 5 caracteres\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Enderezo de E-mail: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Non un enderezo de e-mail vlido\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Carcter non vlido no comentario\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est a usa-lo xogo de caracteres `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4509,7 +4516,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor, non poa o enderezo de correo no nome real ou no comentario\n"
@@ -4525,23 +4532,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeAaSs"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)ar? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)ar? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Por favor, corrixa antes o erro\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4549,12 +4556,12 @@ msgstr ""
"Necesita un contrasinal para protexe-la sa chave secreta.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4566,7 +4573,7 @@ msgstr ""
"momento, empregando este programa coa opcin \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4578,50 +4585,50 @@ msgstr ""
"mentres se xeran os nmeros primos; isto proporcinalle ao xerador de\n"
"nmeros aleatorios unha opoertunidade de acumular entropa de abondo.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeracin de chaves.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "gravando a chave pblica en `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non se atopou un chaveiro pblico no que se poida escribir: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro pblico `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "creronse e asinronse as chaves pblica e secreta.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4631,12 +4638,12 @@ msgstr ""
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeracin da chave fallou: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4644,7 +4651,7 @@ msgstr ""
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4652,26 +4659,26 @@ msgstr ""
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a creacin de subchaves para chaves v3 non cumpre OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realmente? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -7702,7 +7709,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "erro lendo `%s': %s\n"
@@ -7841,7 +7848,7 @@ msgstr ""
"\n"
"Esta ha ser unha auto-sinatura.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "abandonar"
@@ -7886,46 +7893,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "lia longa de mis\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "destinatario por defecto `%s' descoecido\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "fallou a sinatura: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
@@ -8060,74 +8067,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr " creouse un novo ficheiro de configuracin `%s'\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr " creouse un novo ficheiro de configuracin `%s'\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "usar coma ficheiro de sada"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Uso: gpg [opcins] [ficheiros] (-h para ve-la axuda)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "uso: gpg [opcins] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "non se atopou a chave pblica"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "gravando a chave secreta en `%s'\n"
diff --git a/po/hu.po b/po/hu.po
index f192a6d23..47a1b4332 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc Lszl <nfl@nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -92,8 +92,8 @@ msgstr "rossz jelsz"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d%s vd algoritmus nem tmogatott.\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -102,7 +102,7 @@ msgstr "Nem tudom ltrehozni a(z) \"%s\" llomnyt: %s.\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -288,7 +288,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "bbeszd md"
@@ -374,166 +374,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "A hibkat (angolul) a <gnupg-bugs@gnu.org> cmre rja meg!\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Hasznlat: gpg [opcik] [fjlok] (-h a sghoz)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MEGJEGYZS: Nincs alaprtelmezett opcis fjl (%s).\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "\"%s\" opcis fjl: %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "Az opcikat a \"%s\" llomnybl olvasom.\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Hiba \"%s\" ltrehozsakor: %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "Nem tudom a \"%s\" knyvtrat ltrehozni: %s.\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s nem hozhat ltre: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "GPG gynk nem elrhet ebben a munkafolyamatban.\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "Hiba %s-ra/-re kldskor: %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "Frissts sikertelen: %s.\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: Knyvtrat ltrehoztam.\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "Bizalmi adatbzis: olvass sikertelen (n=%d): %s.\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: Nem tudom a knyvtrat ltrehozni: %s.\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk frisstse sikertelen: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "GPG gynk nem elrhet ebben a munkafolyamatban.\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "Nem megfelel formj GPG_AGENT_INFO krnyezeti vltoz!\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "%d gpg-agent protokollverzi nem tmogatott!\n"
@@ -646,7 +646,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -656,7 +656,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -668,19 +668,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "igen"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -705,8 +705,8 @@ msgstr "jelszvltoztats"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
@@ -1114,7 +1114,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsinlni ktegelt mdban!\n"
@@ -1733,7 +1733,7 @@ msgstr "A %08lX msodlagos kulcsot hasznljuk a %08lX elsdleges helyett.\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "%08lX kulcs: titkos kulcs nyilvnos kulcs nlkl - kihagytam.\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1867,7 +1867,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1902,7 +1902,7 @@ msgstr "kanonikus szveges md hasznlata"
msgid "|FILE|write output to FILE"
msgstr "|fjl|bvt modul betltse"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "ne csinljon semmi vltoztatst"
@@ -3347,20 +3347,20 @@ msgstr "Alrs sikertelen: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Ez a kulcs nem vdett.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Az elsdleges kulcs titkos rszei nem elrhetk.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Az elsdleges kulcs titkos rszei nem elrhetk.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "A kulcs vdett.\n"
@@ -3377,7 +3377,7 @@ msgstr ""
"rja be az j jelszt ehhez a titkos kulcshoz!\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "Nem ismtelte meg helyesen a jelszt! Prblja jra!"
@@ -4180,12 +4180,12 @@ msgid "writing key binding signature\n"
msgstr "sszefz alrst rok.\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Kulcsmret rvnytelen; %u bitet hasznlok.\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Kulcsmretet felkerektettem %u bitre.\n"
@@ -4403,7 +4403,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ez gy helyes (i/n)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4420,44 +4427,44 @@ msgstr ""
" \"Heinrich Heine (a klt) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Teljes nv: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "rvnytelen karakter a nvben!\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "A nv lehet, hogy nem kezddhet szmmal!\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "A nv legalbb 5 karakter kell legyen!\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "E-mail cm: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Ez nem rvnyes e-mail cm.\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Megjegyzs: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "rvnytelen karakter a megjegyzsben!\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "n a(z) %s karakterkdolst hasznlja.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4468,7 +4475,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Krem, ne rakja az e-mail cmet a teljes nvbe vagy a megjegyzsbe!\n"
@@ -4483,24 +4490,24 @@ msgstr "Krem, ne rakja az e-mail cmet a teljes nvbe vagy a megjegyzsbe!\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnMmEeRrKk"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(N)v, (M)egjegyzs, (E)-mail megvltoztatsa vagy (K)ilps? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(N)v, (M)egjegyzs, (E)-mail megvltoztatsa vagy (R)endben/(K)ilps? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Krem, elbb javtsa ki a hibt!\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4508,12 +4515,12 @@ msgstr ""
"Most szksg van egy jelszra (vagy mondatra), amely a titkos kulcst vdi.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4525,7 +4532,7 @@ msgstr ""
"az \"--edit-key\" opcival.\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4537,50 +4544,50 @@ msgstr ""
"a lemezeket) a prmszm generlsa alatt. Ez segti a vletlenszm-\n"
"genertort, hogy entrpit tudjon gyjteni.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Kulcs ltrehozsa megszaktva.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "rom a kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem rhat nyilvnoskulcs-karikt talltam: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "Nem rhat titkoskulcs-karikt talltam: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" nyilvnoskulcs-karika rsakor: %s.\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika rsakor: %s.\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "A nyilvnos s titkos kulcsokat ltrehoztam s alrtam.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4590,46 +4597,46 @@ msgstr ""
"kvn ilyen clra ltrehozni, azt az \"--edit-key\" parancs segtsgvel\n"
"teheti meg.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgenerls sikertelen: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu msodperccel a jvben kszlt. (Idugrs vagy raproblma.)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu msodperccel a jvben kszlt. (Idugrs vagy raproblma.)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MEGJEGYZS: Alkulcsok ltrehozsa v3 kulcsokhoz nem OpenPGP-megfelel.\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Valban ltrehozzam? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Nem tudom ltrehozni a(z) \"%s\" llomnyt: %s.\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "MEGJEGYZS: %08lX titkos kulcs %s-kor lejrt.\n"
@@ -7648,7 +7655,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "Hiba a jelsz ltrehozsakor: %s.\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "Hiba \"%s\" olvassakor: %s\n"
@@ -7787,7 +7794,7 @@ msgstr ""
"\n"
"Ez egy nalrs lesz.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "kilps|kilepes"
@@ -7832,46 +7839,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "A sor tl hossz!\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "Ismeretlen alaprtelmezett cmzett: \"%s\"\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "Alrs sikertelen: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "Hiba %s-ra/-re kldskor: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "Hiba %s-ra/-re kldskor: %s\n"
@@ -8005,74 +8012,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "\"%s\": ismeretlen konfigurcis elem.\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "\"%s\": ismeretlen konfigurcis elem.\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "kimeneti llomny megadsa"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Hasznlat: gpg [opcik] [fjlok] (-h a sghoz)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "Hasznlat: gpg [opcik] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "nyilvnos kulcs nem tallhat"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
diff --git a/po/id.po b/po/id.po
index d1a5f53f4..1d3402fa0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -94,8 +94,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -104,7 +104,7 @@ msgstr "tidak dapat membuat %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -290,7 +290,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detil"
@@ -376,166 +376,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "tidak dapat membuat direktori `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: direktori tercipta\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "protokol gpg-agent versi %d tidak didukung\n"
@@ -648,7 +648,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -658,7 +658,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -670,19 +670,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "y|ya"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -707,8 +707,8 @@ msgstr "ubah passphrase"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -1117,7 +1117,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@ -1735,7 +1735,7 @@ 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:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1869,7 +1869,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1904,7 +1904,7 @@ msgstr "gunakan mode teks kanonikal"
msgid "|FILE|write output to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "jangan buat perubahan"
@@ -3358,20 +3358,20 @@ msgstr "gagal menandai: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Kunci ini tidak diproteksi.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Kunci diproteksi.\n"
@@ -3388,7 +3388,7 @@ msgstr ""
"Masukkan passphrase baru untuk kunci rahasia ini.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
@@ -4194,12 +4194,12 @@ msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize tidak valid; menggunakan %u bit\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize dibulatkan hingga %u bit\n"
@@ -4417,7 +4417,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Benar (y/t)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4433,44 +4440,44 @@ msgstr ""
"user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nama sebenarnya: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Alamat email: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Komentar: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4480,7 +4487,7 @@ msgstr ""
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
@@ -4495,23 +4502,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Silakan perbaiki kesalahan ini dulu\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4519,12 +4526,12 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4537,7 +4544,7 @@ msgstr ""
"menggunakan program ini dengan pilihan \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4549,50 +4556,50 @@ msgstr ""
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "menulis kunci publik ke `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "kesalahan menulis keyring publik `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4602,45 +4609,45 @@ msgstr ""
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -7642,7 +7649,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@ -7781,7 +7788,7 @@ msgstr ""
"\n"
"Ini akan jadi self-signature.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "q|k|keluar"
@@ -7826,46 +7833,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "baris terlalu panjang\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "gagal menandai: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -7999,74 +8006,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "gunakan sebagai file output"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "kunci publik tidak ditemukan"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "menulis kunci rahasia ke `%s'\n"
diff --git a/po/it.po b/po/it.po
index 09977910a..2efc8c2d0 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2008-05-26 12:02+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -92,8 +92,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -102,7 +102,7 @@ msgstr "impossibile creare `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -288,7 +288,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "prolisso"
@@ -374,166 +374,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "errore creando `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "impossibile creare la directory `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossibile creare %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent non disponibile in questa sessione\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directory creata\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non disponibile in questa sessione\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "la versione %d del protocollo di gpg-agent non gestita\n"
@@ -646,7 +646,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -656,7 +656,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -668,19 +668,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "si|s"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -705,8 +705,8 @@ msgstr "cambia la passphrase"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@ -1115,7 +1115,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
@@ -1744,7 +1744,7 @@ 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:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1878,7 +1878,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1913,7 +1913,7 @@ msgstr "usa il modo testo canonico"
msgid "|FILE|write output to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "non fa cambiamenti"
@@ -3363,20 +3363,20 @@ msgstr "firma fallita: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Questa chiave non protetta.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "La chiave protetta.\n"
@@ -3393,7 +3393,7 @@ msgstr ""
"Inserisci la nuova passphrase per questa chiave segreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
@@ -4207,12 +4207,12 @@ msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "dimensione della chiave non valida; uso %u bit\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -4430,7 +4430,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr " giusto (s/n)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4447,44 +4454,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nome e Cognome: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Il nome non pu iniziare con una cifra\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Indirizzo di Email: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non valido\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Commento: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4495,7 +4502,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
@@ -4510,23 +4517,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Per favore correggi prima l'errore\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4534,12 +4541,12 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4551,7 +4558,7 @@ msgstr ""
"programma con l'opzione \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4563,50 +4570,50 @@ msgstr ""
"dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
"numeri casuali migliori possibilit di raccogliere abbastanza entropia.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scrittura della chiave pubblica in `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non stato trovato un portachiavi pubblico scrivibile: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non stato trovato un portachiavi segreto scrivibile: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4616,12 +4623,12 @@ msgstr ""
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4629,7 +4636,7 @@ msgstr ""
"la chiave stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4637,26 +4644,26 @@ msgstr ""
"la chiave stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -7685,7 +7692,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@ -7824,7 +7831,7 @@ msgstr ""
"\n"
"Questa sar una autofirma.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "quit"
@@ -7869,46 +7876,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "riga troppo lunga\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "firma fallita: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@ -8042,74 +8049,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "usa come file di output"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "uso: gpg [opzioni] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "chiave pubblica non trovata"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "scrittura della chiave segreta in `%s'\n"
diff --git a/po/ja.po b/po/ja.po
index d41e4bd3b..d219b5b41 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.3.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2004-11-23 11:14+0900\n"
"Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -96,8 +96,8 @@ msgstr "ѥե졼Ǥ"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ݸ%dϥݡȤƤޤ\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -106,7 +106,7 @@ msgstr "%sפǤޤ: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -292,7 +292,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "Ĺ"
@@ -378,166 +378,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Х򸫤Ĥ <gnupg-bugs@gnu.org> ޤǤ𤯤\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Ȥ: gpg [ץ] [ե] (إפ -h)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ": Υץ󡦥ե%sפޤ\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "ץ󡦥ե%s: %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "%sפ饪ץɤ߽Фޤ\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "%sפκ顼: %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "ǥ쥯ȥ꡼%sפǤޤ: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%sפǤޤ: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "Υågpg-agent̵Ǥ\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "PINμ顼: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "%sפǿѥ쥳ɤθ顼: %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "˼Ԥޤ: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "%sפ̩񤭹ߤޤ\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "ǥ쥯ȥ꡼%sפǤޤ\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d)%sǼԤޤ: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "ǥ쥯ȥ꡼%sפǤޤ: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "%sפɽФ顼: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "̩ι˼Ԥޤ: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: å: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "Υågpg-agent̵Ǥ\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFOĶѿν񼰤ޤ\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agentץȥ롦С%dϥݡȤƤޤ\n"
@@ -650,7 +650,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -660,7 +660,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -672,19 +672,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "yes"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -709,8 +709,8 @@ msgstr "ѥե졼ѹ"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "ѥե졼κ顼: %s\n"
@@ -1116,7 +1116,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPno. %s򸡽\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "ϥХå⡼ɤǤϤǤޤ\n"
@@ -1695,7 +1695,7 @@ msgstr "%s縰%sѤޤ\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "%s: Τʤ̩Ǥ - ȤФޤ\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1828,7 +1828,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1867,7 +1867,7 @@ msgstr "ƥȡ⡼ɤ"
msgid "|FILE|write output to FILE"
msgstr "%sפ饪ץɤ߽Фޤ\n"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "̵ѹ"
@@ -3270,20 +3270,20 @@ msgstr "̾˼Ԥޤ: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "θݸƤޤ\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "縰̩ʬޤ\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "縰̩ʬޤ\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "ݸƤޤ\n"
@@ -3300,7 +3300,7 @@ msgstr ""
"̩οѥե졼ϤƤ\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "ѥե졼ȷ֤Ƥޤ󡣺ϤƤ"
@@ -4079,12 +4079,12 @@ msgid "writing key binding signature\n"
msgstr "бؤν̾񤭹ߤޤ\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "̵ʸĹ%uӥåȤˤޤ\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Ĺ%uӥåȤ˴ݤޤ\n"
@@ -4299,7 +4299,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ǥ? (y/N) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4315,44 +4322,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "̾: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "̵̾ʸޤ\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "̾ǻϤƤϤޤ\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "̾5ʸʾǤʤФʤޤ\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Żҥ᡼롦ɥ쥹: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "ͭŻҥ᡼롦ɥ쥹ǤϤޤ\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr ": "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Ȥ̵ʸޤ\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "ʤʸ%sפȤäƤޤ\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4363,7 +4370,7 @@ msgstr ""
" %s\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Żҥ᡼Υɥ쥹̾䥳Ȥʤ褦\n"
@@ -4378,23 +4385,23 @@ msgstr "Żҥ᡼Υɥ쥹̾䥳Ȥʤ褦\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "̾(N)(C)Żҥ᡼(E)ѹޤϽλ(Q)? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "̾(N)(C)Żҥ᡼(E)ѹޤOK(O)λ(Q)? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "ޤ顼Ƥ\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4402,12 +4409,12 @@ msgstr ""
"̩ݸ뤿˥ѥե졼ޤ\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4419,7 +4426,7 @@ msgstr ""
"Ρ--edit-keyɥץǤĤǤѹǤޤ\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4430,50 +4437,50 @@ msgstr ""
"Ȥǥ˥Ȥ¾ΤȤ򤹤ȡҤ\n"
"𻨤礭ʤ䤹ʤΤǡᤤޤ\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "äޤ\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "%sפظ񤭹ߤޤ\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "%sפ̩֤񤭹ߤޤ\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "%sפ̩񤭹ߤޤ\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "߲ǽʸؤĤޤ: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "߲ǽ̩ؤĤޤ: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ء%sפνߥ顼: %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "̩ء%sפνߥ顼: %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "̩̾ޤ\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4482,42 +4489,42 @@ msgstr ""
"θϰŹ沽ˤϻѤǤʤȤդƤŹ沽Ԥˤϡ\n"
"--edit-keyɥޥɤȤäƤ\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "˼Ԥޤ: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "%lṳˤǤޤ (ιԤפξ㳲Ǥ礦)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "%lṳˤǤޤ (ιԤפξ㳲Ǥ礦)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ": v3κϡOpenPGPŬ礷ޤ\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "˺ޤ? (y/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "ɤؤθݴɤ˼Ԥޤ: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Хååסե%sפǤޤ: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ": ɸΥХååפ%sפ¸ޤ\n"
@@ -7470,7 +7477,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "֤μ顼: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "%sפɽФ顼: %s\n"
@@ -7607,7 +7614,7 @@ msgstr " ̾%s"
msgid "This is a qualified signature\n"
msgstr "ʽ̾ˤʤǤ礦\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "quit"
@@ -7652,46 +7659,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "ɽФ˼Ԥޤ: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "ԤĹޤ"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "̤ΤΥץ%s\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "̾˼Ԥޤ: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "%sפɽФ顼: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "%sפǿѥ쥳ɤθ顼: %s\n"
@@ -7824,74 +7831,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "̤Τιܡ%s\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "̤Τιܡ%s\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "ϥեȤƻ"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Ȥ: gpg [ץ] [ե] (إפ -h)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "Ȥ: gpg [ץ] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "Ĥޤ"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "ޥɤ϶ػߤƤޤ\n"
diff --git a/po/nb.po b/po/nb.po
index 0a8b15285..fe10f1522 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.3\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2006-06-13 20:31+0200\n"
"Last-Translator: Trond Endrestl <Trond.Endrestol@fagskolen.gjovik.no>\n"
"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.uio.no>\n"
@@ -96,8 +96,8 @@ msgstr "ugyldig passfrase"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -106,7 +106,7 @@ msgstr "kan ikke opprette %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -292,7 +292,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "fyldig output"
@@ -378,164 +378,164 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Bruksmte: gpg [valg] [filer] (-h for hjelp)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MERK: ingen standard valgfil %s\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "valgfil %s: %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "leser valg fra %s\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "kan ikke opprette katalogen %s: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke opprette %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "feil ved henting av ny PIN: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "feil ved sking etter tillitspost i %s: %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "skriver hemmelig nkkel til %s\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "katalogen %s ble opprettet\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) mislyktes in %s: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "kan ikke opprette katalogen %s: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "feil ved lesing av %s: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "oppdatering av hemmelig mislyktes: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: hoppet over: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr ""
@@ -645,7 +645,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -655,7 +655,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -667,19 +667,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "ja"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -704,8 +704,8 @@ msgstr "endre passfrasen"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -1104,7 +1104,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnummer %s oppdaget\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "kan ikke gjre dette i batchmodus\n"
@@ -1689,7 +1689,7 @@ msgstr "bruker undernkkel %s i stedet for primrnkkel %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "nkkel %s: hemmelig nkkel uten offentlig nkkel - hoppet over\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1822,7 +1822,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1857,7 +1857,7 @@ msgstr "bruk kanonisk tekstmodus"
msgid "|FILE|write output to FILE"
msgstr "leser valg fra %s\n"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "ikke gjr noen endringer"
@@ -3253,19 +3253,19 @@ msgstr "signering mislyktes: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Denne nkkelen er ikke beskyttet.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige deler av primrnkkelen er ikke tilgjengelig.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemmelige deler av primrnkkelen er lagret p kort.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Nkkelen er beskyttet.\n"
@@ -3280,7 +3280,7 @@ msgid ""
"\n"
msgstr "Tast inn den nye passfrasen for denne hemmelige nkklen.\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "passfrasen ble ikke gjentatt korrekt; prv igjen"
@@ -4014,12 +4014,12 @@ msgid "writing key binding signature\n"
msgstr "skriver nkkelbindende signatur\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nkkelstrrelsen er ugyldig; bruker %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nkkelstrrelsen ble rundet opp til %u bits\n"
@@ -4236,7 +4236,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/N)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4252,44 +4259,44 @@ msgstr ""
" Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Fullt navn: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Ugyldig tegn i navn\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Navnet kan ikke starte med et siffer\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Navnet m vre minst 5 tegn langt\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Ugyldig tegn i kommentar\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruker tegnsettet %s.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4300,7 +4307,7 @@ msgstr ""
" %s\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -4316,23 +4323,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnKeEeRrAa"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Vennligst korriger feilen frst\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4340,12 +4347,12 @@ msgstr ""
"Du trenger en passfrase for beskytte din hemmelige nkkel.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4357,7 +4364,7 @@ msgstr ""
"hjelp av dette programmet og valget --edit-key.\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4369,50 +4376,50 @@ msgstr ""
"diskene jobbe) under primtallgenereringen; dette gir\n"
"tilfeldig-tall-generatoren en bedre sjanse til samle nok entropy.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Nkkelgenereringen ble avbrutt.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentlig nkkel til %s\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver forelpig hemmelig nkkel til %s\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmelig nkkel til %s\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbart offentlig nkkelknippe ble funnet: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "ingen skrivbart hemmelig nkkelknippe ble funnet: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "feil ved skriving av offentlig nkkelknippe %s: %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "feil ved skriving av hemmelig nkkelknippe %s: %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nkkel opprettet og signert.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4421,13 +4428,13 @@ msgstr ""
"kanskje bruke kommandoen --edit-key for generere en\n"
"sekundrnkkel for dette formlet.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nkkelgenerering mislyktes: %s\n"
# Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4436,7 +4443,7 @@ msgstr ""
"klokkeproblem)\n"
# Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4444,27 +4451,27 @@ msgstr ""
"nkkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
"klokkeproblem)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MERK: opprettelse av undernkler for v3-nkler er ikke i samsvar med "
"OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Virkelig opprette? (j/N)"
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "lagring av nkkel p kort mislyktes: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan ikke opprette sikkerhetskopifil %s: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -7402,7 +7409,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "feil ved opprettelse av passfrase: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "feil ved lesing av %s: %s\n"
@@ -7539,7 +7546,7 @@ msgstr " aka %s"
msgid "This is a qualified signature\n"
msgstr "Dette vil vre en selvsignatur.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "avslutt"
@@ -7584,46 +7591,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "lesing av offentlig nkkel mislyktes: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "for lang linje"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "ukjent valg %s\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "signering mislyktes: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "feil ved lesing av %s: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "feil ved sking etter tillitspost i %s: %s\n"
@@ -7755,74 +7762,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "ukjent konfigurasjonspunkt %s\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "ukjent konfigurasjonspunkt %s\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "bruk som outputfil"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Bruksmte: gpg [valg] [filer] (-h for hjelp)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "bruksmte: gpg [valg] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "fant ikke offentlig nkkel"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "Admin-kommandoer er ikke tillatt\n"
diff --git a/po/pl.po b/po/pl.po
index 382d51dcd..a798688de 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.7\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2007-11-26 19:01+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -92,8 +92,8 @@ msgstr "Haso"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh wiksze ni %d bitw nie s obsugiwane\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -102,7 +102,7 @@ msgstr "nie mona utworzy ,,%s'': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -298,7 +298,7 @@ msgstr "uruchomienie w trybie demona (w tle)"
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "z dodatkowymi informacjami"
@@ -379,17 +379,17 @@ msgstr "wczenie emulacji ssh-agenta"
msgid "|FILE|write environment settings also to FILE"
msgstr "|PLIK|zapis ustawie rodowiska take do PLIKU"
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Bdy prosimy zgasza na adres <"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Wywoanie: gpg-agent [opcje] (-h podaje pomoc)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -397,146 +397,146 @@ msgstr ""
"Skadnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarzdzanie kluczem tajnym dla GnuPG\n"
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "podano bdny poziom diagnostyki ,,%s''\n"
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
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:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domylnego pliku opcji ,,%s''\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "bd tworzenia ,,%s'': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nie mona utworzy katalogu ,,%s'': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr "nazwa gniazda zbyt duga\n"
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, c-format
msgid "can't create socket: %s\n"
msgstr "nie mona utworzy gniazda: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "nazwa gniazda zbyt duga\n"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ju dziaa - nie uruchamianie nowego\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "bd podczas odczytu nowego PIN-u: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "bd podczas przypisywania gniazda do ,,%s'': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() nie powiodo si: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, c-format
msgid "listening on socket `%s'\n"
msgstr "nasuchiwanie na gniedzie ,,%s''\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "katalog ,,%s'' utworzony\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat() nie powiodo si dla ,,%s'': %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "nie mona uy ,,%s'' jako katalogu domowego\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "bd odczytu z %s: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "obsuga 0x%lx dla fd %d uruchomiona\n"
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "obsuga 0x%lx dla fd %d zakoczona\n"
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "obsuga ssh 0x%lx dla fd %d uruchomiona\n"
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "obsuga ssh 0x%lx dla fd %d zakoczona\n"
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select nie powiodo si: %s - czekanie 1s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr "brak dziaajcego gpg-agenta w tej sesji\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "zy format zmiennej rodowiskowej GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "wersja %d protokou agenta nie jest obsugiwana\n"
@@ -650,7 +650,7 @@ msgstr "bd odczytu listy zaufanych certyfikatw gwnych\n"
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -662,7 +662,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr "Akceptuj"
@@ -674,7 +674,7 @@ msgstr "Akceptuj"
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -683,11 +683,11 @@ msgstr ""
"Czy absolutnie ufasz, e%%0A ,,%s''%%0Apoprawnie powiadcza certyfikaty "
"uytkownikw?"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "Yes"
msgstr "Tak"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr "Nie"
@@ -712,8 +712,8 @@ msgstr "Zmiana hasa"
msgid "I'll change it later"
msgstr "Zmieni je pniej"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "bd tworzenia potoku: %s\n"
@@ -1117,7 +1117,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Wykryto kart OpenPGP nr %s\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nie dziaa w trybie wsadowym\n"
@@ -1701,7 +1701,7 @@ msgstr "uywany jest podklucz %s zamiast klucza gwnego %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "klucz %s: klucz tajny bez klucza jawnego - pominity\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1834,7 +1834,7 @@ msgid "run in server mode"
msgstr "uruchomienie w trybie serwera"
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1869,7 +1869,7 @@ msgstr "kanoniczny format tekstowy"
msgid "|FILE|write output to FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
@@ -3300,19 +3300,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Klucz ma tylko zalepk albo elementy na karcie - nie ma hasa do zmiany.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Ten klucz nie jest chroniony.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz tajna gwnego klucza jest niedostpna.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Cz tajna gwnego klucza jest zapisana na karcie.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Klucz jest chroniony.\n"
@@ -3329,7 +3329,7 @@ msgstr ""
"Wprowad nowe dugie, skomplikowane haso dla tego klucza tajnego.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "haso nie zostao poprawnie powtrzone; jeszcze jedna prba"
@@ -4103,12 +4103,12 @@ msgid "writing key binding signature\n"
msgstr "zapis podpisu wicego klucz\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "niewaciwa dugo klucza; wykorzystano %u bitw\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rozmiar klucza zaokrglony w gr do %u bitw\n"
@@ -4323,7 +4323,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Czy wszystko si zgadza (t/N)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4339,44 +4346,44 @@ msgstr ""
" \"Tadeusz eleski (Boy) <tzb@ziemianska.pl>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Imi i nazwisko: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Niewaciwy znak w imieniu lub nazwisku\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Imi lub nazwisko nie moe zaczyna si od cyfry\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Imi i nazwisko musz mie co najmniej 5 znakw dugoci.\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "To nie jest poprawny adres poczty elektronicznej\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Komentarz: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Niewaciwy znak w komentarzu\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Uywasz zestawu znakw %s.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4387,7 +4394,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Nie naley umieszcza adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -4404,25 +4411,25 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmieni (I)mi/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmieni (I)mi/nazwisko, (K)omentarz, adres (E)mail, przej (D)alej,\n"
"czy (W)yj z programu? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Najpierw trzeba poprawi ten bd\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4430,12 +4437,12 @@ msgstr ""
"Musisz poda dugie, skomplikowane haso aby ochroni swj klucz tajny.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4447,7 +4454,7 @@ msgstr ""
"\"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4463,50 +4470,50 @@ msgstr ""
"iloci\n"
"entropii.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zostaa anulowana.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuj klucz publiczny w ,,%s''\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuj zalepk klucza tajnego w ,,%s''\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuj klucz tajny w ,,%s''\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "bd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "bd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zostay utworzone i podpisane.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4514,12 +4521,12 @@ msgstr ""
"Ten klucz nie moe by wykorzystany do szyfrowania. Komend \"--edit-key\"\n"
"mona doda do niego podklucz szyfrujcy.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powioda si: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4527,7 +4534,7 @@ msgstr ""
"klucz zosta stworzony %lu sekund w przyszoci (zaburzenia\n"
"czasoprzestrzeni, lub le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4535,26 +4542,26 @@ msgstr ""
"klucz zosta stworzony %lu sekund w przyszoci (zaburzenia\n"
"czasoprzestrzeni, lub le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzy? (t/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zapis klucza na karcie nie powid si: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nie mona utworzy pliku kopii zapasowej ,,%s'': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
@@ -7498,7 +7505,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "bd importu certyfikatu: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, c-format
msgid "error reading input: %s\n"
msgstr "bd odczytu wejcia: %s\n"
@@ -7640,7 +7647,7 @@ msgstr " alias"
msgid "This is a qualified signature\n"
msgstr "To jest podpis kwalifikowany\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
msgid "quiet"
msgstr "cicho"
@@ -7685,45 +7692,45 @@ msgstr ""
"Skadnia: gpg-connect-agent [opcje]\n"
"Poczenie z dziaajcym agentem i wysyanie polece\n"
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr "opcja ,,%s'' wymaga programu i opcjonalnych argumentw\n"
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "opcja ,,%s'' zignorowana z powodu ,,%s''\n"
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, c-format
msgid "receiving line failed: %s\n"
msgstr "odbieranie linii nie powiodo si: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
msgid "line too long - skipped\n"
msgstr "linia zbyt duga - pominita\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr "linia skrcona z powodu osadzonego znaku Nul\n"
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, c-format
msgid "unknown command `%s'\n"
msgstr "nieznane polecenie ,,%s''\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, c-format
msgid "sending line failed: %s\n"
msgstr "wysyanie linii nie powiodo si: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, c-format
msgid "error sending %s command: %s\n"
msgstr "bd wysyania polecenia %s: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, c-format
msgid "error sending standard options: %s\n"
msgstr "bd wysyania standardowych opcji: %s\n"
@@ -7855,52 +7862,66 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr "Konfiguracja dla OCSP"
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr "Uwaga, okrelenia grup s ignorowane\n"
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr "lista wszystkich komponentw"
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr "sprawdzenie wszystkich programw"
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr "|KOMPONENT|wypisanie opcji"
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr "|KOMPONENT|zmiana opcji"
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+#, fuzzy
+msgid "|COMPONENT|check options"
+msgstr "|KOMPONENT|zmiana opcji"
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr "zastosowanie globalnych wartoci domylnych"
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
msgid "check global configuration file"
msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "plik wyjciowy"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr "uaktywnienie zmian w czasie dziaania o ile to moliwe"
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Wywoanie: gpgconf [opcje] (-h podaje pomoc)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
@@ -7908,19 +7929,19 @@ msgstr ""
"Skadnia: gpgconf [opcje]\n"
"Zarzdzanie opcjami konfiguracji dla narzdzi z systemu GnuPG\n"
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
msgid "usage: gpgconf [options] "
msgstr "wywoanie: gpgconf [opcje]"
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr "Wymagany jest jeden argument komponentu"
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
msgid "Component not found"
msgstr "Nie znaleziono komponentu"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
msgid "No argument allowed"
msgstr "Argument nie jest dozwolony"
diff --git a/po/pt.po b/po/pt.po
index 7b9143450..d621cab20 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
@@ -95,8 +95,8 @@ msgstr "frase secreta incorrecta"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de proteco %d%s no suportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -105,7 +105,7 @@ msgstr "impossvel criar `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -291,7 +291,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detalhado"
@@ -378,166 +378,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg [opes] [ficheiros] (-h para ajuda)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de opes por omisso `%s' inexistente\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opes `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler opes de `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "erro ao criar `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: impossvel criar directoria: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossvel criar %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "o gpg-agent no est disponvel nesta sesso\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizao falhou: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: directoria criada\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "base de dados de confiana: leitura falhou (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: impossvel criar directoria: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "actualizao da chave secreta falhou: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "o gpg-agent no est disponvel nesta sesso\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "varivel de ambiente GPG_AGENT_INFO invlida\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "a verso %d do protocolo gpg-agent no suportada\n"
@@ -650,7 +650,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -660,7 +660,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -672,19 +672,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "sim"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -709,8 +709,8 @@ msgstr "muda a frase secreta"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
@@ -1120,7 +1120,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossvel fazer isso em modo no-interativo\n"
@@ -1737,7 +1737,7 @@ msgstr "usando chave secundria %08lX ao invs de chave primria %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave pblica - ignorada\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1871,7 +1871,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1910,7 +1910,7 @@ msgstr "usar modo de texto cannico"
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar mdulo de extenso FICHEIRO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "no fazer alteraes"
@@ -3359,20 +3359,20 @@ msgstr "assinatura falhou: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Componentes secretas da chave primria no disponveis.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Componentes secretas da chave primria no disponveis.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "A chave protegida.\n"
@@ -3389,7 +3389,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "a frase secreta no foi repetida corretamente; tente outra vez"
@@ -4193,12 +4193,12 @@ msgid "writing key binding signature\n"
msgstr "a escrever a assinatura ligada a uma chave\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamanho de chave invlido; a utilizar %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamanho da chave arredondado para %u bits\n"
@@ -4416,7 +4416,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est correto (s/n)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4434,44 +4441,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Caracter invlido no nome\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "O nome no pode comear com um dgito\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Endereo de correio eletrnico: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Endereo eletrnico invlido\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Comentrio: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Caracter invlido no comentrio\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc est usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4482,7 +4489,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no coloque o endereo de email no nome verdadeiro ou no "
@@ -4499,23 +4506,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Mudar (N)ome, (C)omentrio, (E)mail ou (S)air? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Mudar (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Por favor corrija primeiro o erro\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4523,12 +4530,12 @@ msgstr ""
"Voc precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4540,7 +4547,7 @@ msgstr ""
"qualquer hora, usando este programa com a opo \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4552,50 +4559,50 @@ msgstr ""
"gerao dos nmeros primos; isso d ao gerador de nmeros aleatrios\n"
"uma hiptese maior de ganhar entropia suficiente.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Gerao de chave cancelada.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "a escrever chave pblica para `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenhum porta-chaves pblico com permisses de escrita encontrado: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenhum porta-chaves secreto com permisses de escrita encontrado: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves pblico `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "chaves pblica e privada criadas e assinadas.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4604,12 +4611,12 @@ msgstr ""
"Note que esta chave no pode ser usada para cifragem. Voc pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secundria para esse fim.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4617,7 +4624,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4625,26 +4632,26 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a criao de sub-chave para chaves v3 no respeito o OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossvel criar `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -7662,7 +7669,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -7801,7 +7808,7 @@ msgstr ""
"\n"
"Isto ser uma auto-assinatura.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "sair"
@@ -7846,46 +7853,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "frase secreta demasiado longa\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "destinatrio por omisso desconhecido `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "assinatura falhou: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
@@ -8021,74 +8028,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "criado um novo ficheiro de configurao `%s'\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "criado um novo ficheiro de configurao `%s'\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "usar como ficheiro de sada"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Uso: gpg [opes] [ficheiros] (-h para ajuda)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "uso: gpg [opes] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "chave pblica no encontrada"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "a escrever chave privada para `%s'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 65a376bee..276be1d71 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -99,8 +99,8 @@ msgstr "frase secreta incorreta"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de proteo %d no suportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
@@ -109,7 +109,7 @@ msgstr "impossvel criar %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -296,7 +296,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detalhado"
@@ -382,164 +382,164 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Uso: gpg [opes] [arquivos] (-h para ajuda)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de opes padro `%s' inexistente\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de opes `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo opes de `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, fuzzy, c-format
msgid "error creating `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, fuzzy, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: impossvel criar diretrio: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossvel criar %s: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "Certificado de revogao vlido"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr ""
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "atualizao falhou: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: diretrio criado\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: impossvel criar diretrio: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "atualizao da chave secreta falhou: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves ignoradas\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr ""
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, fuzzy, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "algoritmo de proteo %d no suportado\n"
@@ -651,7 +651,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -661,7 +661,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -673,19 +673,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "sim"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -710,8 +710,8 @@ msgstr "muda a frase secreta"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
@@ -1126,7 +1126,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossvel fazer isso em modo no-interativo\n"
@@ -1741,7 +1741,7 @@ msgstr "usando chave secundria %08lX ao invs de chave primria %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave pblica - ignorada\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1881,7 +1881,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1920,7 +1920,7 @@ msgstr "usar modo de texto cannico"
msgid "|FILE|write output to FILE"
msgstr "|ARQUIVO|carregar mdulo de extenso ARQUIVO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "no fazer alteraes"
@@ -3363,21 +3363,21 @@ msgstr "assinatura falhou: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "chave secreta no disponvel"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "chave secreta no disponvel"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "A chave protegida.\n"
@@ -3394,7 +3394,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "A frase secreta no foi repetida corretamente; tente outra vez.\n"
@@ -4198,12 +4198,12 @@ msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido %u bits\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
@@ -4422,7 +4422,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est correto (s/n)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4439,44 +4446,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Caractere invlido no nome\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "O nome no pode comear com um dgito\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Endereo de correio eletrnico: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Endereo eletrnico invlido\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Comentrio: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Caractere invlido no comentrio\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc est usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4487,7 +4494,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -4502,24 +4509,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muda (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muda (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4527,12 +4534,12 @@ msgstr ""
"Voc precisa de uma frase secreta para proteger sua chave.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4544,7 +4551,7 @@ msgstr ""
"qualquer hora, usando este programa com a opo \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4556,50 +4563,50 @@ msgstr ""
"gerao dos nmeros primos; isso d ao gerador de nmeros aleatrios\n"
"uma chance melhor de conseguir entropia suficiente.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Gerao de chave cancelada.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado pblico para `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "chave %08lX: chave pblica no encontrada: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "impossvel bloquear chaveiro secreto: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "chaves pblica e privada criadas e assinadas.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4608,12 +4615,12 @@ msgstr ""
"Note que esta chave no pode ser usada para criptografia. Voc pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secundria para esse fim.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4621,7 +4628,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4629,26 +4636,26 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossvel criar %s: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -7674,7 +7681,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "erro na criao da frase secreta: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -7812,7 +7819,7 @@ msgid "This is a qualified signature\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
# INICIO MENU
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "sair"
@@ -7857,46 +7864,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "linha muito longa\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "destinatrio padro desconhecido `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "assinatura falhou: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -8033,74 +8040,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "%s: novo arquivo de opes criado\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "%s: novo arquivo de opes criado\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "usar como arquivo de sada"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Uso: gpg [opes] [arquivos] (-h para ajuda)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "uso: gpg [opes] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "chave pblica no encontrada"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "escrevendo certificado privado para `%s'\n"
diff --git a/po/ro.po b/po/ro.po
index ea570d6d7..d1bac7466 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -98,8 +98,8 @@ msgstr "fraz-parol incorect"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -108,7 +108,7 @@ msgstr "nu pot crea `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -295,7 +295,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "locvace"
@@ -381,166 +381,166 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr "Raportai bug-uri la <gnupg-bugs@gnu.org>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Folosire: gpg [opiuni] [fiiere] (-h pentru ajutor)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOT: nici un fiier opiuni implicit `%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fiier opiuni `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "citesc opiuni din `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "eroare la creearea `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nu pot crea directorul `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nu pot crea `%s': %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nu este disponibil n aceast sesiune\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eroare la obinere noului PIN: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizarea a euat: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "scriu cheia secret n `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "director `%s' creat\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) a euat n %s: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a euat: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: srit: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nu este disponibil n aceast sesiune\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabila de mediu GPG_AGENT_INFO anormal\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent versiune protocol %d nu este suportat\n"
@@ -656,7 +656,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -666,7 +666,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -678,19 +678,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "da"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -715,8 +715,8 @@ msgstr "schimb fraza-parol"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "eroare la crearea frazei-parol: %s\n"
@@ -1123,7 +1123,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "cardul OpenPGP nr. %s detectat\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru n modul batch\n"
@@ -1712,7 +1712,7 @@ msgstr "folosim subcheia %s n loc de cheia primar %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "cheia %s: cheie secret fr cheie public - srit\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1845,7 +1845,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1880,7 +1880,7 @@ msgstr "folosete modul text canonic"
msgid "|FILE|write output to FILE"
msgstr "|FIIER|ncarc modulul extensie FIIER"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
@@ -3316,19 +3316,19 @@ msgstr ""
"Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz "
"parol de schimbat.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Aceast cheie nu este protejat.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Prile secrete ale cheii primare nu sunt disponibile.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Pri secrete ale cheii primare sunt stacate pe card.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Cheia este protejat.\n"
@@ -3345,7 +3345,7 @@ msgstr ""
"Introducei noua fraz-parol pentru acest cheie secret.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "fraza-parol nu a fost repetat corect; mai ncercai o dat"
@@ -4115,12 +4115,12 @@ msgid "writing key binding signature\n"
msgstr "scriu semntur legat de cheie\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "lungime cheie invalid; folosesc %u bii\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "lungime cheie rotunjit la %u bii\n"
@@ -4333,7 +4333,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Este aceasta corect? (d/N) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4350,44 +4357,44 @@ msgstr ""
" \"Popa Ioan (popic) <popa.ioan@compania.ro>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Nume real: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Caracter invalid n nume\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Numele nu poate ncepe cu o cifr\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Numele trebuie s fie de cel puin 5 caractere\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Adres de email: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Nu este o adres de email valid\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Comentariu: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Caracter invalid n comentariu\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Folosii setul de caractere `%s'\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4398,7 +4405,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "V rugm nu punei adresa de email n numele real sau comentariu\n"
@@ -4413,23 +4420,23 @@ msgstr "V rugm nu punei adresa de email n numele real sau comentariu\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoTt"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Schimb (N)ume, (C)omentariu, (E)mail sau (T)Termin? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Schimb (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "V rugm corectai mai nti eroarea\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4437,12 +4444,12 @@ msgstr ""
"Avei nevoie de o fraz-parol pentru a v proteja cheia secret.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4453,7 +4460,7 @@ msgstr ""
"O s o fac oricum. Putei schimba fraza-parol oricnd, folosind acest\n"
"program cu opiunea \"--edit-key\".\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4465,50 +4472,50 @@ msgstr ""
"n timpul generrii numerelor prime; aceasta d o ans generatorului de\n"
"numere aleatoare o ans mai bun de a aduna destul entropie.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulat.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scriu cheia public n `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scriu talonul (stub) cheii secrete n `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scriu cheia secret n `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nu am gsit nici un inel de chei public de scris: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nu am gsit nici un inel de chei secret de scris: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "cheile secret i public au fost create i semnate.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4518,12 +4525,12 @@ msgstr ""
"s folosii comanda \"--edit-key\" pentru a genera o subcheie secundar\n"
"pentru acest scop.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a euat: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4531,7 +4538,7 @@ msgstr ""
"cheia a fost creat %lu secund n viitor (warp n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4539,25 +4546,25 @@ msgstr ""
"cheia a fost creat %lu secunde n viitor (warp n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOT: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Creai ntr-adevr? (d/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "stocarea cheii pe card a euat: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nu pot crea fiier de rezerv `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOT: copia de sigurana a cheii cardului salvat la `%s'\n"
@@ -7546,7 +7553,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "eroare la obinerea numrului serial: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@ -7683,7 +7690,7 @@ msgstr " aka \"%s\""
msgid "This is a qualified signature\n"
msgstr "Aceasta va fi o auto-semntur.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "termin"
@@ -7728,46 +7735,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "citirea cheii publice a euat: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "linie prea lung"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "opiune necunoscut `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "semnarea a euat: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
@@ -7902,74 +7909,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "articol configurare necunoscut `%s'\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "articol configurare necunoscut `%s'\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "folosete ca fiier ieire"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Folosire: gpg [opiuni] [fiiere] (-h pentru ajutor)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "folosire: gpg [opiuni] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "cheia public nu a fost gsit"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "Nu sunt permise comenzi administrare\n"
diff --git a/po/ru.po b/po/ru.po
index 79a15bcfc..76ba4dbf5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 2.0.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2006-11-07 19:31+0300\n"
"Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -88,8 +88,8 @@ msgstr "Фраза-пароль"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -98,7 +98,7 @@ msgstr "не могу создать `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -278,7 +278,7 @@ msgstr "запуск в режиме демона (background)"
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "подробно"
@@ -359,17 +359,17 @@ msgstr "разрешить эмуляцию ssh-агента"
msgid "|FILE|write environment settings also to FILE"
msgstr "|FILE|сохранить состояние в файл"
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "О найденных ошибках сообщайте <"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -377,147 +377,147 @@ msgstr ""
"Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
"Управление закрытыми ключами для GnuPG\n"
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "запрошен недупустимый уровень отладки `%s'\n"
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, fuzzy, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл конфигурации `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "параметры конфигурации из файла `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "ошибка создания `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "не могу создать каталог `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr "имя сокета слишком длинное\n"
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу создать сокет: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "имя сокета слишком длинное\n"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "нет gpg-agent доступого для данной сессии\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "ошибка при получении нового PIN: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "ошибка связывния сокета с `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, c-format
msgid "listen() failed: %s\n"
msgstr ""
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, c-format
msgid "listening on socket `%s'\n"
msgstr "слушаем сокет `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "создан каталог `%s'\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "невозможно использовать `%s' как домашний каталог\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "ошибка чтения из %s: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr ""
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s: остановлен\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr "нет gpg-agent доступого для данной сессии\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "протокол gpg-agent версии %d не поддерживается\n"
@@ -631,7 +631,7 @@ msgstr "ошибка чтения списка доверяемых корнев
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -643,7 +643,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr "Подтверждаю"
@@ -655,7 +655,7 @@ msgstr "Подтверждаю"
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -664,11 +664,11 @@ msgstr ""
"Действительно абсолютно доверять%%0A \"%s\"%%0Aкорректно подписанным "
"сертификатам пользователя?"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "Yes"
msgstr "Да"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr "Нет"
@@ -693,8 +693,8 @@ msgstr "сменить фразу-пароль"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, c-format
msgid "error creating a pipe: %s\n"
msgstr ""
@@ -1096,7 +1096,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s \n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "невозможно сделать это в пакетном режиме\n"
@@ -1676,7 +1676,7 @@ msgstr "использую подклключ %s вместо главного
msgid "key %s: secret key without public key - skipped\n"
msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1809,7 +1809,7 @@ msgid "run in server mode"
msgstr "запуск в режиме сервера"
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1844,7 +1844,7 @@ msgstr "использовать канонический текстовый р
msgid "|FILE|write output to FILE"
msgstr "|FILE|взять параметры из FILE"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "не делать никаких изменений"
@@ -3255,19 +3255,19 @@ msgstr "не удалось подписать: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Данный ключ не защищен.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретная часть главного ключа отсутствует.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Секретная часть главного ключа сохранена на карте.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Ключ защищен.\n"
@@ -3284,7 +3284,7 @@ msgstr ""
"Введите новую фразу-пароль для данного секретного ключа.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
@@ -4032,12 +4032,12 @@ msgid "writing key binding signature\n"
msgstr "сохраняем объединяющую подпись\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "неверный размер ключа; используется %u бит\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "размер ключа приведен к %u битам\n"
@@ -4252,7 +4252,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Все верно? (y/N) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4267,44 +4274,44 @@ msgstr ""
" \"Baba Yaga (pensioner) <yaga@deepforest.ru>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Ваше настоящее имя: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Недопустимый символ в Имени\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Имя не должно начинаться с цифры\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Имя не должно быть короче 5 символов\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "Email-адрес: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Неправильный e-mail адрес\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Комментарий: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Недопустимый символ в комментарии\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Используемая таблица символов: `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4315,7 +4322,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
@@ -4330,24 +4337,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Сначала исправьте ошибку\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4355,12 +4362,12 @@ msgstr ""
"Для защиты секретного ключа необходима фраза-пароль.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4372,7 +4379,7 @@ msgstr ""
"запустив данную программу с ключом \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4385,50 +4392,50 @@ msgstr ""
"обращения к дискам) в процессе генерации; это даст генератору\n"
"случайных чисел возможность получить лучшую энтропию.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "сохранение открытого ключа в `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "сохранение заглушки секретного ключа в `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "сохранение секретного ключа в `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "открытый и закрытый ключи созданы и подписаны.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4436,44 +4443,44 @@ msgstr ""
"Учтите, данный ключ не может использоваться для шифрования. Можно\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N)"
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "сбой сохранения ключа на карту: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "не могу создать резервную копию, файл `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
@@ -7417,7 +7424,7 @@ msgstr "ошибка базовой проверки сертификата - н
msgid "error importing certificate: %s\n"
msgstr "ошибка импортирования сертификата: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, c-format
msgid "error reading input: %s\n"
msgstr "ошибка чтения ввода: %s\n"
@@ -7552,7 +7559,7 @@ msgstr " aka"
msgid "This is a qualified signature\n"
msgstr "Это будет самоподпись.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
msgid "quiet"
msgstr ""
@@ -7597,45 +7604,45 @@ msgstr ""
"Синтаксис: gpg-connect-agent: [параметры]\n"
"Связывается с запущенным агентом и отcылает команды\n"
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, c-format
msgid "receiving line failed: %s\n"
msgstr "сбой получения строки: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
msgid "line too long - skipped\n"
msgstr "строка слишком длинная - пропущено\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, c-format
msgid "unknown command `%s'\n"
msgstr "неизвестная команда `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, c-format
msgid "sending line failed: %s\n"
msgstr "сбой отправки строки: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, c-format
msgid "error sending %s command: %s\n"
msgstr "ошибка отправки %s команды: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, c-format
msgid "error sending standard options: %s\n"
msgstr "ошибка отправки стандартных параметров: %s\n"
@@ -7771,53 +7778,67 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr "Настройки OCSP"
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr "вывод списка всех компонентов"
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr "|COMPONENT|вывод списка параметров"
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr "|COMPONENT|изменить параметры"
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+#, fuzzy
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|изменить параметры"
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "неизвестный параметр в файле конфигурации `%s'\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "неизвестный параметр в файле конфигурации `%s'\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "вывод в указанный файл"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr "применить изменения во время исполнения, если возможно"
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Использование: gpgconf [параметры] (-h для подсказки)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
@@ -7825,19 +7846,19 @@ msgstr ""
"Синтаксис: gpgconf [параметры]\n"
"Управляет параметрами конфигурации инструментария GnuPG\n"
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
msgid "usage: gpgconf [options] "
msgstr "использование: gpgconf [параметры] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr "Требуется однокомпонентный аргумент"
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
msgid "Component not found"
msgstr "Компонент не найден"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "Команды администрирования не разрешены\n"
diff --git a/po/sk.po b/po/sk.po
index c20ac87b5..7d74793c8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -91,8 +91,8 @@ msgstr "nesprvne heslo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann algoritmus %d%s nie je podporovn\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -101,7 +101,7 @@ msgstr "nemem vytvori `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -287,7 +287,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "s dodatonmi informciami"
@@ -373,168 +373,168 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
"Chyby oznmte, prosm, na adresu <gnupg-bugs@gnu.org>.\n"
"Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Pouitie: gpg [monosti] [sbory] (-h pre pomoc)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZNMKA: neexistuje implicitn sbor s monosami `%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "sbor s monosami `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "tam monosti z `%s'\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "chyba pri vytvran `%s': %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "nemem vytvori adresr `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: nemem vytvori: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nie je v tomto seden dostupn\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pri vytvran hesla: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "chyba pri posielan na `%s': %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualizcia zlyhala: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, fuzzy, c-format
msgid "directory `%s' created\n"
msgstr "%s: adresr vytvoren\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "databza dvery: procedra read() (n=%d) zlyhala: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "%s: nemem vytvori adresr: %s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pri tan `%s': %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "aktualizcia tajnho ka zlyhala: %s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: preskoen: %s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nie je v tomto seden dostupn\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "zl formt premennej prostredia GPG_AGENT_INFO\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent protokol verzie %d nie je podporovan\n"
@@ -647,7 +647,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -657,7 +657,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -669,19 +669,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "ano"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -706,8 +706,8 @@ msgstr "zmeni heslo"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "chyba pri vytvran hesla: %s\n"
@@ -1116,7 +1116,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemono previes v dvkovom mde\n"
@@ -1736,7 +1736,7 @@ msgstr "pouvam sekundrny k %08lX namiesto primrneho ka %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "k %08lX: tajn k bez verejnho ka - preskoen\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1870,7 +1870,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1909,7 +1909,7 @@ msgstr "poui knonick textov md"
msgid "|FILE|write output to FILE"
msgstr "|SBOR|nahra rozirujci modul SBOR"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "nevykona iadne zmeny"
@@ -3371,20 +3371,20 @@ msgstr "podpisovanie zlyhalo: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Tento k nie je chrnen.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn asti primrneho ka nie s dostupn.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn asti primrneho ka nie s dostupn.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "k je chrnen.\n"
@@ -3401,7 +3401,7 @@ msgstr ""
"Vlote nov heslo (passphrase) pre tento tajn k.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nie je zopakovan sprvne; skste to znovu"
@@ -4200,12 +4200,12 @@ msgid "writing key binding signature\n"
msgstr "zapisujem \"key-binding\" podpis\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn dka ka; pouijem %u bitov\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dka ka zaokrhlen na %u bitov\n"
@@ -4423,7 +4423,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Je to sprvne (a/n)? "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
#, fuzzy
msgid ""
"\n"
@@ -4440,44 +4447,44 @@ msgstr ""
" \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Meno a priezvisko: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Neplatn znak ve mene\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Meno neme zana slicou\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Meno mus by dlh aspo 5 znakov\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "E-mailov adresa: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "Neplatn e-mailov adresa\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Komentr: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Neplatn znak v komentri\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pouvate znakov sadu `%s'.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4488,7 +4495,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do poa meno alebo komentr nepte, prosm, e-mailov adresu.\n"
@@ -4503,23 +4510,23 @@ msgstr "Do poa meno alebo komentr nepte, prosm, e-mailov adresu.\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "mMkKeEPpUu"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmeni (M)eno, (K)omentr, (E)-mail alebo (U)koni? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Zmeni (M)eno, (K)omentr, (E)-mail alebo (P)okraova/(U)koni? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Najskr, prosm, opravte chybu\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4527,12 +4534,12 @@ msgstr ""
"Na ochranu Vho tajnho ka muste zada heslo.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4544,7 +4551,7 @@ msgstr ""
"tohto programu s parametrom \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4556,50 +4563,50 @@ msgstr ""
"pouva disky); vaka tomu m genertor lepiu ancu zska dostatok "
"entropie.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Vytvranie ka bolo zruen.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisujem verejn k do `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenjden zapisovaten sbor verejnch kov (pubring): %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenjden zapisovaten sbor tajnch kov (secring): %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pri zpise do sboru verejnch kov `%s': %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pri zpise do sboru tajnch kov `%s': %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "verejn a tajn k boli vytvoren a podpsan.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4608,12 +4615,12 @@ msgstr ""
"Tento k neme by pouit na ifrovanie. Pre vytvorenie\n"
"sekundrneho ka na tento el mete poui prkaz \"--edit-key\".\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie ka sa nepodarilo: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4621,7 +4628,7 @@ msgstr ""
"k bol vytvoren %lu sekund v budcnosti (dolo k zmene asu alebo\n"
"je problm so systmovm asom)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4629,26 +4636,26 @@ msgstr ""
"k bol vytvoren %lu sekund v budcnosti (dolo k zmene asu alebo\n"
"je problm so systmovm asom)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZNMKA: vytvorenie podka pre ke v3 nie je v slade s OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skutone vytvori? "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nemem vytvori `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "POZNMKA: platnos tajnho ka %08lX skonila %s\n"
@@ -7669,7 +7676,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "chyba pri vytvran hesla: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "chyba pri tan `%s': %s\n"
@@ -7808,7 +7815,7 @@ msgstr ""
"\n"
"Ide o podpis ka nm samm\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "ukoni"
@@ -7853,46 +7860,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "riadok je prli dlh\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "neznmy implicitn adrest `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "chyba pri posielan na `%s': %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "chyba pri posielan na `%s': %s\n"
@@ -8026,74 +8033,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "neznma poloka konfigurcie \"%s\"\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "neznma poloka konfigurcie \"%s\"\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "poui ako vstupn sbor"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Pouitie: gpg [monosti] [sbory] (-h pre pomoc)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "pouitie: gpg [monosti] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "verejn k nenjden"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "zapisujem tajn k do `%s'\n"
diff --git a/po/sv.po b/po/sv.po
index d2eb82471..a9734b5f3 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2007-11-12 16:08+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -111,8 +111,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -121,7 +121,7 @@ msgstr "kan inte skapa \"%s\": %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -313,7 +313,7 @@ msgstr "kör i demonläge (bakgrund)"
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "utförlig"
@@ -395,17 +395,17 @@ msgstr "aktivera ssh-agent-emulering"
msgid "|FILE|write environment settings also to FILE"
msgstr "|FIL|skriv miljöinställningar även till FIL"
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Rapportera fel till <"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -413,146 +413,146 @@ msgstr ""
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "ogiltig debug-level \"%s\" angiven\n"
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
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:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "OBS: inställningsfilen \"%s\" saknas\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "läser inställningar från \"%s\"\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "Fel när \"%s\" skapades: %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "%s: kan inte skapa katalog: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr "namnet på uttaget är för långt\n"
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan inte skapa uttag: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "namnet på uttaget \"%s\" är för långt\n"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "en gpg-agent är redan igång - startar inte en till\n"
# Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
msgid "error getting nonce for the socket\n"
msgstr "fel vid hämtning av nonce för uttaget\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "fel när \"%s\" bands till uttag: %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() misslyckades: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, c-format
msgid "listening on socket `%s'\n"
msgstr "lyssnar på uttaget \"%s\"\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "katalogen \"%s\" skapades\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat() misslyckades för \"%s\": %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "kan inte använda \"%s\" som hemkatalog\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fel vid läsning av nonce på fd %d: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "hanteraren 0x%lx för fd %d startad\n"
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "hanteraren 0x%lx för fd %d avslutad\n"
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh-hanteraren 0x%lx för fd %d startad\n"
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select misslyckades: %s - väntar 1 s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kör i den här sessionen\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "GPG-Agent protokoll version %d stöds inte\n"
@@ -667,7 +667,7 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -679,7 +679,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr "Korrekt"
@@ -691,7 +691,7 @@ msgstr "Korrekt"
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -700,11 +700,11 @@ msgstr ""
"Litar du förbehållslöst på%%0A \"%s\"%%0Aatt korrekt certifiera "
"användarcertifikat?"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "Yes"
msgstr "Ja"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr "Nej"
@@ -732,8 +732,8 @@ msgstr "ändra lösenfras"
msgid "I'll change it later"
msgstr "Jag ändrar den senare"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
@@ -1143,7 +1143,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kort nr. %s identifierades\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i satsläge\n"
@@ -1732,7 +1732,7 @@ 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:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1867,7 +1867,7 @@ msgstr "kör i serverläge"
# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1902,7 +1902,7 @@ msgstr "använd \"ursprunglig text\"-läget"
msgid "|FILE|write output to FILE"
msgstr "|FIL|läs inställningar från FIL"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "gör inga ändringar"
@@ -3343,19 +3343,19 @@ msgstr ""
"Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
"att ändra.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Denna nyckel är inte skyddad.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Nyckeln är skyddad.\n"
@@ -3372,7 +3372,7 @@ msgstr ""
"Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "lösenfrasen repeterades inte korrekt; försök igen."
@@ -4143,12 +4143,12 @@ msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@ -4369,7 +4369,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Stämmer detta? (j/N) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4387,44 +4394,44 @@ msgstr ""
" \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Namn: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Namnet får inte börja med en siffra\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "E-postadress: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "E-postadressen är ogiltig\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du använder teckentabellen \"%s\"\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4435,7 +4442,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Ange inte e-postadressen som namn eller kommentar\n"
@@ -4451,24 +4458,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Rätta först felet\n"
# fel kapitalisering i originalet?
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4476,12 +4483,12 @@ msgstr ""
"Du behöver en lösenfras för att skydda din hemliga nyckel\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4493,7 +4500,7 @@ msgstr ""
"om du använder detta program med flaggan \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4505,51 +4512,51 @@ msgstr ""
"hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver den publika nyckeln till \"%s\"\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemliga nyckelstumpen till \"%s\"\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
# Flagga.. inte kommando
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4558,13 +4565,13 @@ msgstr ""
"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
"syfte.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
# c-format behövs inte i singularis
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4572,7 +4579,7 @@ msgstr ""
"nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4580,25 +4587,25 @@ msgstr ""
"nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Verkligen skapa? (j/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
@@ -7581,7 +7588,7 @@ msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
msgid "error importing certificate: %s\n"
msgstr "fel vid import av certifikat: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, c-format
msgid "error reading input: %s\n"
msgstr "fel vid läsning av indata: %s\n"
@@ -7725,7 +7732,7 @@ msgstr " även känd som"
msgid "This is a qualified signature\n"
msgstr "Det här är en kvalificerad signatur\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
msgid "quiet"
msgstr "tyst"
@@ -7769,45 +7776,45 @@ msgstr ""
"Syntax: gpg-connect-agent [flaggor]\n"
"Anslut till en körande agent och skicka kommandon\n"
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr "flaggan \"%s\" kräver ett program och valfria argument\n"
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, c-format
msgid "receiving line failed: %s\n"
msgstr "mottagande rad misslyckades: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
msgid "line too long - skipped\n"
msgstr "raden är för lång - hoppades över\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr "rad nerkortad på grund av inbäddat Nul-tecken\n"
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, c-format
msgid "unknown command `%s'\n"
msgstr "okänt kommando \"%s\"\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, c-format
msgid "sending line failed: %s\n"
msgstr "sändande rad misslyckades: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, c-format
msgid "error sending %s command: %s\n"
msgstr "fel vid sändning av %s-kommando: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, c-format
msgid "error sending standard options: %s\n"
msgstr "fel vid sändning av standardflaggor: %s\n"
@@ -7937,51 +7944,65 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr "Konfiguration för OCSP"
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr "Observera att gruppspecifikationer ignoreras\n"
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr "lista alla komponenter"
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr "kontrollera alla program"
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr "|KOMPONENT|lista flaggor"
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr "|KOMPONENT|ändra flaggor"
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+#, fuzzy
+msgid "|COMPONENT|check options"
+msgstr "|KOMPONENT|ändra flaggor"
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr "tillämpa globala standardvärden"
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
msgid "list global configuration file"
msgstr "lista global konfigurationsfil"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
msgid "check global configuration file"
msgstr "kontrollera global konfigurationsfil"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "använd som fil för utdata"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr "aktivera ändringar vid körtid, om möjligt"
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
@@ -7989,19 +8010,19 @@ msgstr ""
"Syntax: gpgconf [flaggor]\n"
"Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
msgid "usage: gpgconf [options] "
msgstr "användning: gpgconf [flaggor] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr "Behöver ett komponentargument"
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
msgid "Component not found"
msgstr "Komponenten hittades inte"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
msgid "No argument allowed"
msgstr "Inget argument tillåts"
diff --git a/po/tr.po b/po/tr.po
index 94fe37660..01a61701d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.9.94\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2006-11-04 03:45+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -91,8 +91,8 @@ 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:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -101,7 +101,7 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -281,7 +281,7 @@ msgstr "artalan süreci olarak çalışır"
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "ayrıntılı"
@@ -362,17 +362,17 @@ msgstr "ssh-agent öykünümü etkinleşir"
msgid "|FILE|write environment settings also to FILE"
msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Yazılım hatalarını lütfen <"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -380,147 +380,147 @@ msgstr ""
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, fuzzy, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "`%s' oluşturulurken hata: %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "`%s' dizini oluşturulamıyor: %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr "soketin ismi çok uzun\n"
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, c-format
msgid "can't create socket: %s\n"
msgstr "soket oluşturulamıyor: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, fuzzy, c-format
msgid "socket name `%s' is too long\n"
msgstr "soketin ismi çok uzun\n"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "yeni PIN alınırken hata: %s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "soket `%s'e bağlanırken hata: %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, c-format
msgid "listen() failed: %s\n"
msgstr "soket dinleme başarısız: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, c-format
msgid "listening on socket `%s'\n"
msgstr "`%s' soketi dinlemede\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "dizin `%s' oluşturuldu\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "%s için stat() başarısız oldu: %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "`%s' ev dizini olarak kullanılamıyor\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "%s okunurken hata: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select başarısız: %s - 1s bekliyor\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
@@ -636,7 +636,7 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -648,7 +648,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr "Doğru"
@@ -660,7 +660,7 @@ msgstr "Doğru"
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -669,11 +669,11 @@ msgstr ""
"Kullanıcı sertifikalarının%%0A \"%s\"%%0Aile doğru olarak onaylanacağından "
"son derece emin misiniz?"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "Yes"
msgstr "Evet"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr "Hayır"
@@ -698,8 +698,8 @@ msgstr "anahtar parolası değiştirir"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
@@ -1101,7 +1101,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "%s numaralı OpenPGP kartı saptandı\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
@@ -1686,7 +1686,7 @@ 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:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1819,7 +1819,7 @@ msgid "run in server mode"
msgstr "sunucu kipinde çalışır"
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1854,7 +1854,7 @@ msgstr "kurallı metin kipini kullanır"
msgid "|FILE|write output to FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
@@ -3281,19 +3281,19 @@ msgstr ""
"Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
"değiştirilecek bir anahtar parolası yok.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "Bu anahtar korunmamış.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "Anahtar korunmuş.\n"
@@ -3310,7 +3310,7 @@ msgstr ""
"Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr ""
"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -4106,12 +4106,12 @@ msgid "writing key binding signature\n"
msgstr "anahtarı garantileyen imzayı yazıyor\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -4326,7 +4326,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Bu doğru mu? (e/H ya da y/N) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4342,44 +4349,44 @@ msgstr ""
"\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "Adınız ve Soyadınız: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "Ad ve soyadınızda geçersiz karakter var\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "E-posta adresiniz: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "geçerli bir E-posta adresi değil\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "Önbilgi: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "Önbilgi alanında geçersiz karakter var\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4390,7 +4397,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -4406,24 +4413,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "AaYyEeTtKk"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "Lütfen önce hatayı düzeltin\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4431,12 +4438,12 @@ msgstr ""
"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4448,7 +4455,7 @@ msgstr ""
"seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4461,50 +4468,50 @@ msgstr ""
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "genel anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gizli anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtarlık yok: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "yazılabilir bir gizli anahtarlık yok: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4512,19 +4519,19 @@ msgstr ""
"Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
"\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4532,26 +4539,26 @@ msgstr ""
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -7510,7 +7517,7 @@ msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
msgid "error importing certificate: %s\n"
msgstr "sertifika ithal edilirken hata: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, c-format
msgid "error reading input: %s\n"
msgstr "girdi okunurken hata: %s\n"
@@ -7652,7 +7659,7 @@ msgstr " nam-ı diğer"
msgid "This is a qualified signature\n"
msgstr "Bu bir öz-imza olacak.\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
msgid "quiet"
msgstr "sessiz"
@@ -7697,45 +7704,45 @@ msgstr ""
"Sözdizimi: gpg-connect-agent [seçenekler]\n"
"Çalışan bir aracıya bağlanıp komutları gönderir\n"
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr "\"%s\" seçeneği bir program ve seçimlik argümanlar gerektirir\n"
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, c-format
msgid "receiving line failed: %s\n"
msgstr "satır alımı başarısız: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
msgid "line too long - skipped\n"
msgstr "satır çok uzun - atlandı\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr "gömülü boş karakterden dolayı satır kısaldı\n"
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, c-format
msgid "unknown command `%s'\n"
msgstr "komut `%s' bilinmiyor\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, c-format
msgid "sending line failed: %s\n"
msgstr "satır göndirimi başarısız: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, c-format
msgid "error sending %s command: %s\n"
msgstr "%s komutu gönderilirken hata: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, c-format
msgid "error sending standard options: %s\n"
msgstr "standart seçenekler gönderilirken hata: %s\n"
@@ -7871,53 +7878,67 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr "OCSP için yapılandırma"
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr "tüm bileşenleri listeler"
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr "|BİLEŞEN|seçenekleri listeler"
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr "|BİLEŞEN|seçenekleri değiştirir"
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+#, fuzzy
+msgid "|COMPONENT|check options"
+msgstr "|BİLEŞEN|seçenekleri değiştirir"
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "çıktı dosyası olarak kullanılır"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
@@ -7925,19 +7946,19 @@ msgstr ""
"Sözdizimi: gpgconf [seçenekler]\n"
"GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
msgid "usage: gpgconf [options] "
msgstr "kullanımı: gpgconf [seçenekler] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr "Tek bileşen argümanı gerekiyor"
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
msgid "Component not found"
msgstr "Bileşen yok"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "Yönetici komutlarına izin verilmez\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2abe04010..b1a0357bb 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@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -98,8 +98,8 @@ msgstr "错误的密码"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -108,7 +108,7 @@ msgstr "无法建立‘%s’:%s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -294,7 +294,7 @@ msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "详细模式"
@@ -380,168 +380,168 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
msgstr ""
"请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
"请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立‘%s’时发生错误:%s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’:%s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败:%s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "已创建目录‘%s’\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错:%s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "更新私钥失败:%s\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s:已跳过:%s\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "不支持 gpg-agent 协议版本 %d\n"
@@ -654,7 +654,7 @@ msgstr ""
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -664,7 +664,7 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr ""
@@ -676,19 +676,19 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
#, fuzzy
msgid "Yes"
msgstr "yes"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr ""
@@ -713,8 +713,8 @@ msgstr "更改密码"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
@@ -1116,7 +1116,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@ -1689,7 +1689,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s:无相应公钥的私钥――已跳过\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1822,7 +1822,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1857,7 +1857,7 @@ msgstr "使用标准的文本模式"
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "不做任何改变"
@@ -3243,19 +3243,19 @@ msgstr "签名时失败: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -3272,7 +3272,7 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符;请再试一次"
@@ -4020,12 +4020,12 @@ msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效:改用 %u 位\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4238,7 +4238,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "以上正确吗?(y/n)"
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4254,44 +4261,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "真实姓名:"
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "电子邮件地址:"
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "注释:"
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4302,7 +4309,7 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@ -4317,23 +4324,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4341,12 +4348,12 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4358,7 +4365,7 @@ msgstr ""
"再次执行这个程序,并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4368,50 +4375,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环:%s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4419,42 +4426,42 @@ msgstr ""
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败:%s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意:卡密钥的备份已保存到‘%s’\n"
@@ -7389,7 +7396,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "读取‘%s’时出错:%s\n"
@@ -7526,7 +7533,7 @@ msgstr " 亦即“%s”"
msgid "This is a qualified signature\n"
msgstr "这将是一个自身签名。\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "quit"
@@ -7571,46 +7578,46 @@ msgid ""
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
#, fuzzy
msgid "line too long - skipped\n"
msgstr "列太长"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "未知的选项 '%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "签名时失败: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
@@ -7743,74 +7750,87 @@ msgstr ""
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr ""
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr ""
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr ""
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr ""
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr ""
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+msgid "|COMPONENT|check options"
+msgstr ""
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr ""
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
#, fuzzy
msgid "list global configuration file"
msgstr "未知的配置项‘%s’\n"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
#, fuzzy
msgid "check global configuration file"
msgstr "未知的配置项‘%s’\n"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "指定输出文件"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr ""
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
#, fuzzy
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "用法:gpg [选项] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
#, fuzzy
msgid "Component not found"
msgstr "找不到公钥"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
#, fuzzy
msgid "No argument allowed"
msgstr "不允许使用管理员命令\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 952b0e147..49c6b6246 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2008-05-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+0200\n"
"PO-Revision-Date: 2008-03-26 22:35+0800\n"
"Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -94,8 +94,8 @@ msgstr "密語"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3155
-#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
+#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
msgid "can't create `%s': %s\n"
@@ -104,7 +104,7 @@ msgstr "無法建立 `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
@@ -283,7 +283,7 @@ msgstr "以服務模式執行 (背景)"
#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "囉唆模式"
@@ -364,17 +364,17 @@ msgstr "啟用 ssh-agent 模擬"
msgid "|FILE|write environment settings also to FILE"
msgstr "|檔案|將環境設定也寫至「檔案」"
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程式瑕疵則請回報給 <"
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "用法: gpg-agent [選項] (或用 -h 求助)"
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
@@ -382,145 +382,145 @@ msgstr ""
"語法: gpg-agent [選項] [指令 [引數]]\n"
"GnuPG 私鑰管理\n"
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "給定的除錯等級 `%s' 無效\n"
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
-#: agent/gpg-agent.c:621 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "請注意: 沒有預設選項檔 `%s'\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "選項檔 `%s': %s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "從 `%s' 讀取選項中\n"
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立 `%s' 時出錯: %s\n"
-#: agent/gpg-agent.c:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
#: g10/openfile.c:429 scd/scdaemon.c:923
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "無法建立目錄 `%s': %s\n"
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
msgid "name of socket too long\n"
msgstr "socket 名稱太長\n"
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
#, c-format
msgid "can't create socket: %s\n"
msgstr "無法建立 socket: %s\n"
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
#, c-format
msgid "socket name `%s' is too long\n"
msgstr "socket 名稱 `%s' 太長\n"
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
msgid "error getting nonce for the socket\n"
msgstr "為 socket 取得 nonce 時出錯\n"
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() 失敗: %s\n"
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
#, c-format
msgid "listening on socket `%s'\n"
msgstr "正在候聽 socket `%s'\n"
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "`%s' 目錄已建立\n"
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
#, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "stat() 失敗於 `%s': %s\n"
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
#, c-format
msgid "can't use `%s' as home directory\n"
msgstr "無法使用 `%s' 做為家目錄\n"
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
#, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent 協定版本 %d 未被支援\n"
@@ -632,7 +632,7 @@ msgstr "讀取已信任根憑證清單時出錯\n"
#. second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives
#. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -642,7 +642,7 @@ msgstr "請驗證憑證與此完全相同:%%0A \"%s\"%%0A其指紋為:%%0A %s"
#. TRANSLATORS: "Correct" is the label of a button and intended to
#. be hit if the fingerprint matches the one of the CA. The other
#. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
msgid "Correct"
msgstr "正確"
@@ -654,18 +654,18 @@ msgstr "正確"
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr "請問你是否徹底信任%%0A \"%s\"%%0A正確驗證使用者憑證的能力?"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "Yes"
msgstr "Yes"
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
msgid "No"
msgstr "No"
@@ -689,8 +689,8 @@ msgstr "更改密語"
msgid "I'll change it later"
msgstr "我稍後再變更"
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
#, c-format
msgid "error creating a pipe: %s\n"
msgstr "建立管道時出錯: %s\n"
@@ -1070,7 +1070,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
@@ -1643,7 +1643,7 @@ msgstr "使用子鑰 %s 來替換主鑰 %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1776,7 +1776,7 @@ msgid "run in server mode"
msgstr "以伺服器模式執行"
#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1810,7 +1810,7 @@ msgstr "使用標準的文字模式"
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至「檔案」"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "不要做任何改變"
@@ -3198,19 +3198,19 @@ msgstr "簽署時失敗: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
msgid "This key is not protected.\n"
msgstr "這把金鑰未被保護.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分無法取用.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上.\n"
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
msgid "Key is protected.\n"
msgstr "金鑰已保護.\n"
@@ -3227,7 +3227,7 @@ msgstr ""
"請輸入要給這把私鑰用的新密語.\n"
"\n"
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
msgid "passphrase not correctly repeated; try again"
msgstr "前後兩次輸入的密語不一致; 請再試一次"
@@ -3977,12 +3977,12 @@ msgid "writing key binding signature\n"
msgstr "寫入附鑰簽章中\n"
#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3030
+#: g10/keygen.c:3049
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "金鑰尺寸無效; 改用 %u 位元\n"
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -4195,7 +4195,14 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "以上正確嗎? (y/N) "
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4210,44 +4217,44 @@ msgstr ""
" \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
"\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
msgid "Real name: "
msgstr "真實姓名: "
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
msgid "Invalid character in name\n"
msgstr "姓名含有無效的字符\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用數字開頭\n"
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五個字符長\n"
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
msgid "Email address: "
msgstr "電子郵件地址: "
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
msgid "Not a valid email address\n"
msgstr "不是有效的電子郵件地址\n"
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
msgid "Comment: "
msgstr "註釋: "
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
msgid "Invalid character in comment\n"
msgstr "註釋含有無效的字符\n"
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "你正在使用 `%s' 字元集.\n"
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4258,7 +4265,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
@@ -4273,23 +4280,23 @@ msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
msgid "Please correct the error first\n"
msgstr "請先訂正錯誤\n"
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4297,12 +4304,12 @@ msgstr ""
"你需要一個密語來保護你的私鑰.\n"
"\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4314,7 +4321,7 @@ msgstr ""
"僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4325,50 +4332,50 @@ msgstr ""
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
msgid "Key generation canceled.\n"
msgstr "金鑰產生已取消.\n"
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在寫入公鑰至 `%s'\n"
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "正在寫入私鑰 stub 至 `%s'\n"
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在寫入私鑰至 `%s'\n"
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已建立及簽署.\n"
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4376,42 +4383,42 @@ msgstr ""
"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
"來產生加密用的子鑰.\n"
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
-#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
-#: g10/keygen.c:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "儲存金鑰到卡片上時失敗: %s\n"
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "無法建立備份檔案 `%s': %s\n"
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -7284,7 +7291,7 @@ msgstr "基本的憑證檢查失敗了 - 未匯入\n"
msgid "error importing certificate: %s\n"
msgstr "匯入憑證時出錯: %s\n"
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
#, c-format
msgid "error reading input: %s\n"
msgstr "讀取輸入時出錯: %s\n"
@@ -7423,7 +7430,7 @@ msgstr " 亦即"
msgid "This is a qualified signature\n"
msgstr "這是一份合格簽章\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
msgid "quiet"
msgstr "安靜模式"
@@ -7467,45 +7474,45 @@ msgstr ""
"語法: gpg-connect-agent [選項]\n"
"連線至運作中的代理程式並送出指令\n"
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr "\"%s\" 選項需要有程式及選用的引數\n"
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
#, c-format
msgid "receiving line failed: %s\n"
msgstr "接收列時失敗: %s\n"
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
msgid "line too long - skipped\n"
msgstr "列太長 - 已跳過\n"
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
msgid "line shortened due to embedded Nul character\n"
msgstr "列因嵌入的 Nul 字符而縮短了\n"
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
#, c-format
msgid "unknown command `%s'\n"
msgstr "未知的指令 `%s'\n"
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
#, c-format
msgid "sending line failed: %s\n"
msgstr "送出列時失敗: %s\n"
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
#, c-format
msgid "error sending %s command: %s\n"
msgstr "送出 `%s' 指令時出錯: %s\n"
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
#, c-format
msgid "error sending standard options: %s\n"
msgstr "送出標準選項時出錯: %s\n"
@@ -7634,51 +7641,65 @@ msgstr "LDAP 伺服器清單"
msgid "Configuration for OCSP"
msgstr "OCSP 組態"
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
msgid "Note that group specifications are ignored\n"
msgstr "請注意群組規格已忽略\n"
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
msgid "list all components"
msgstr "列出所有的元件"
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
msgid "check all programs"
msgstr "檢查所有的程式"
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
msgid "|COMPONENT|list options"
msgstr "|元件|列出選項"
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
msgid "|COMPONENT|change options"
msgstr "|元件|變更選項"
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+#, fuzzy
+msgid "|COMPONENT|check options"
+msgstr "|元件|變更選項"
+
+#: tools/gpgconf.c:66
msgid "apply global default values"
msgstr "套用全域預設值"
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
msgid "list global configuration file"
msgstr "列出全域組態檔"
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
msgid "check global configuration file"
msgstr "檢查全域組態檔案"
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
msgid "use as output file"
msgstr "當作輸出檔案來使用"
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
msgid "activate changes at runtime, if possible"
msgstr "如果可能的話, 在執行期啟用變更"
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
msgid "Usage: gpgconf [options] (-h for help)"
msgstr "用法: gpgconf [選項] (或用 -h 求助)"
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
msgid ""
"Syntax: gpgconf [options]\n"
"Manage configuration options for tools of the GnuPG system\n"
@@ -7686,19 +7707,19 @@ msgstr ""
"語法: gpgconf [選項]\n"
"管理 GnuPG 系統工具的組態選項\n"
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
msgid "usage: gpgconf [options] "
msgstr "用法: gpgconf [選項] "
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
msgid "Need one component argument"
msgstr "需要一個元件引數"
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
msgid "Component not found"
msgstr "找不到元件"
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
msgid "No argument allowed"
msgstr "未允許使用引數"