aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO4
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/gpg.c15
-rw-r--r--g10/gpgv.c218
-rw-r--r--po/ChangeLog4
-rw-r--r--po/be.po614
-rw-r--r--po/ca.po613
-rw-r--r--po/cs.po616
-rw-r--r--po/da.po621
-rw-r--r--po/de.po691
-rw-r--r--po/el.po622
-rw-r--r--po/eo.po621
-rw-r--r--po/es.po620
-rw-r--r--po/et.po622
-rw-r--r--po/fi.po622
-rw-r--r--po/fr.po615
-rw-r--r--po/gl.po622
-rw-r--r--po/hu.po622
-rw-r--r--po/id.po622
-rw-r--r--po/it.po622
-rw-r--r--po/ja.po623
-rw-r--r--po/nb.po615
-rw-r--r--po/pl.po612
-rw-r--r--po/pt.po625
-rw-r--r--po/pt_BR.po633
-rw-r--r--po/ro.po616
-rw-r--r--po/ru.po612
-rw-r--r--po/sk.po626
-rw-r--r--po/sv.po612
-rw-r--r--po/tr.po612
-rw-r--r--po/zh_CN.po615
-rw-r--r--po/zh_TW.po612
-rw-r--r--sm/ChangeLog4
-rw-r--r--sm/gpgsm.c499
34 files changed, 8690 insertions, 8836 deletions
diff --git a/TODO b/TODO
index 431a75a5c..dafe3e74a 100644
--- a/TODO
+++ b/TODO
@@ -90,6 +90,10 @@
* UTF-8 specific TODOs
None.
+* Manual
+** Document all gpgsm options.
+
+
* Pinpad Reader
We do not yet support P15 applications. The trivial thing using
ASCII characters will be easy to implement but the other cases need
diff --git a/g10/ChangeLog b/g10/ChangeLog
index c098a20a0..389ee5954 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-13 Werner Koch <[email protected]>
+
+ * gpgv.c: Use new ARGPARSE macros and re-indent.
+
2008-11-11 Werner Koch <[email protected]>
* gpg.c (opts): Use new ARGPARSE macros for clarity.
diff --git a/g10/gpg.c b/g10/gpg.c
index b5b27f70d..942d26c04 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -369,8 +369,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_group (300, N_("@Commands:\n ")),
- ARGPARSE_c (aSign, "sign", N_("|[file]|make a signature")),
- ARGPARSE_c (aClearsign, "clearsign", N_("|[file]|make a clear text signature")),
+ ARGPARSE_c (aSign, "sign", N_("make a signature")),
+ ARGPARSE_c (aClearsign, "clearsign", N_("make a clear text signature")),
ARGPARSE_c (aDetachedSign, "detach-sign", N_("make a detached signature")),
ARGPARSE_c (aEncr, "encrypt", N_("encrypt data")),
ARGPARSE_c (aEncrFiles, "encrypt-files", "@"),
@@ -428,7 +428,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aDeArmor, "dearmour", "@"),
ARGPARSE_c (aEnArmor, "enarmor", "@"),
ARGPARSE_c (aEnArmor, "enarmour", "@"),
- ARGPARSE_c (aPrintMD, "print-md", N_("|algo [files]|print message digests")),
+ ARGPARSE_c (aPrintMD, "print-md", N_("print message digests")),
ARGPARSE_c (aPrimegen, "gen-prime", "@" ),
ARGPARSE_c (aGenRandom,"gen-random", "@" ),
ARGPARSE_c (aServer, "server", N_("run in server mode")),
@@ -438,7 +438,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_n (oArmor, "armor", N_("create ascii armored output")),
ARGPARSE_s_n (oArmor, "armour", "@"),
- ARGPARSE_s_s (oRecipient, "recipient", N_("|NAME|encrypt for NAME")),
+ ARGPARSE_s_s (oRecipient, "recipient", N_("|USER-ID|encrypt for USER-ID")),
ARGPARSE_s_s (oHiddenRecipient, "hidden-recipient", "@"),
ARGPARSE_s_s (oRecipient, "remote-user", "@"), /* (old option name) */
ARGPARSE_s_s (oDefRecipient, "default-recipient", "@"),
@@ -451,9 +451,10 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
ARGPARSE_s_s (oHiddenEncryptTo, "hidden-encrypt-to", "@"),
ARGPARSE_s_s (oLocalUser, "local-user",
- N_("use this user-id to sign or decrypt")),
+ N_("|USER-ID|use USER-ID to sign or decrypt")),
- ARGPARSE_s_i (oCompress, NULL, N_("|N|set compress level N (0 disables)")),
+ ARGPARSE_s_i (oCompress, NULL,
+ N_("|N|set compress level to N (0 disables)")),
ARGPARSE_s_i (oCompressLevel, "compress-level", "@"),
ARGPARSE_s_i (oBZ2CompressLevel, "bzip2-compress-level", "@"),
ARGPARSE_s_n (oBZ2DecompressLowmem, "bzip2-decompress-lowmem", "@"),
@@ -546,7 +547,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_s_n (oRFC2440, "rfc2440", "@"),
ARGPARSE_s_n (oRFC4880, "rfc4880", "@"),
ARGPARSE_s_n (oOpenPGP, "openpgp", N_("use strict OpenPGP behavior")),
- ARGPARSE_s_n (oPGP2, "pgp2", N_("generate PGP 2.x compatible messages")),
+ ARGPARSE_s_n (oPGP2, "pgp2", "@"),
ARGPARSE_s_n (oPGP6, "pgp6", "@"),
ARGPARSE_s_n (oPGP7, "pgp7", "@"),
ARGPARSE_s_n (oPGP8, "pgp8", "@"),
diff --git a/g10/gpgv.c b/g10/gpgv.c
index b81ae6000..e708d5c21 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -1,6 +1,6 @@
/* gpgv.c - The GnuPG signature verify utility
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005,
- * 2006 Free Software Foundation, Inc.
+ * 2006, 2008 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -51,61 +51,64 @@
#include "call-agent.h"
-enum cmd_and_opt_values { aNull = 0,
- oQuiet = 'q',
- oVerbose = 'v',
- oBatch = 500,
- oKeyring,
- oIgnoreTimeConflict,
- oStatusFD,
- oLoggerFD,
- oHomedir,
-aTest };
+enum cmd_and_opt_values {
+ aNull = 0,
+ oQuiet = 'q',
+ oVerbose = 'v',
+ oBatch = 500,
+ oKeyring,
+ oIgnoreTimeConflict,
+ oStatusFD,
+ oLoggerFD,
+ oHomedir,
+ aTest
+};
static ARGPARSE_OPTS opts[] = {
+ ARGPARSE_group (300, N_("@\nOptions:\n ")),
+
+ ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
+ ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
+ ARGPARSE_s_s (oKeyring, "keyring",
+ N_("|FILE|take the keys from the keyring FILE")),
+ ARGPARSE_s_n (oIgnoreTimeConflict, "ignore-time-conflict",
+ N_("make timestamp conflicts only a warning")),
+ ARGPARSE_s_i (oStatusFD, "status-fd",
+ N_("|FD|write status info to this FD")),
+ ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
+ ARGPARSE_s_s (oHomedir, "homedir", "@"),
- { 301, NULL, 0, N_("@\nOptions:\n ") },
-
- { oVerbose, "verbose", 0, N_("verbose") },
- { oQuiet, "quiet", 0, N_("be somewhat more quiet") },
- { oKeyring, "keyring" ,2, N_("take the keys from this keyring")},
- { oIgnoreTimeConflict, "ignore-time-conflict", 0,
- N_("make timestamp conflicts only a warning") },
- { oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
- { oLoggerFD, "logger-fd",1, "@" },
- { oHomedir, "homedir", 2, "@" }, /* defaults to "~/.gnupg" */
-
-{0} };
+ ARGPARSE_end ()
+};
int g10_errors_seen = 0;
+
static const char *
my_strusage( int level )
{
- const char *p;
- switch( level ) {
- case 11: p = "gpgv (GnuPG)";
- break;
- case 13: p = VERSION; break;
- case 17: p = PRINTABLE_OS_NAME; break;
- case 19: p =
- _("Please report bugs to <[email protected]>.\n");
- break;
- case 1:
- case 40: p =
- _("Usage: gpgv [options] [files] (-h for help)");
+ const char *p;
+ switch (level)
+ {
+ case 11: p = "gpgv (GnuPG)";
+ break;
+ case 13: p = VERSION; break;
+ case 17: p = PRINTABLE_OS_NAME; break;
+ case 19: p = _("Please report bugs to <[email protected]>.\n");
break;
- case 41: p =
- _("Syntax: gpg [options] [files]\n"
- "Check signatures against known trusted keys\n");
+ case 1:
+ case 40: p = _("Usage: gpgv [options] [files] (-h for help)");
+ break;
+ case 41: p = _("Syntax: gpg [options] [files]\n"
+ "Check signatures against known trusted keys\n");
break;
- default: p = NULL;
+ default: p = NULL;
}
- return p;
+ return p;
}
@@ -113,83 +116,84 @@ my_strusage( int level )
int
main( int argc, char **argv )
{
- ARGPARSE_ARGS pargs;
- int rc=0;
- strlist_t sl;
- strlist_t nrings=NULL;
- unsigned configlineno;
-
- set_strusage (my_strusage);
- log_set_prefix ("gpgv", 1);
-
- /* Make sure that our subsystems are ready. */
- init_common_subsystems ();
-
- gnupg_init_signals (0, NULL);
- i18n_init();
-
- opt.command_fd = -1; /* no command fd */
- opt.pgp2_workarounds = 1;
- opt.keyserver_options.options|=KEYSERVER_AUTO_KEY_RETRIEVE;
- opt.trust_model = TM_ALWAYS;
- opt.batch = 1;
-
- opt.homedir = default_homedir ();
-
- tty_no_terminal(1);
- tty_batchmode(1);
- disable_dotlock();
-
- pargs.argc = &argc;
- pargs.argv = &argv;
- pargs.flags= 1; /* do not remove the args */
- while( optfile_parse( NULL, NULL, &configlineno, &pargs, opts) ) {
- switch( pargs.r_opt ) {
- case oQuiet: opt.quiet = 1; break;
- case oVerbose:
- opt.verbose++;
- opt.list_sigs=1;
- gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
- break;
- case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
- case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
- case oLoggerFD:
- log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));
- break;
- case oHomedir: opt.homedir = pargs.r.ret_str; break;
- case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
- default : pargs.err = 2; break;
+ ARGPARSE_ARGS pargs;
+ int rc=0;
+ strlist_t sl;
+ strlist_t nrings=NULL;
+ unsigned configlineno;
+
+ set_strusage (my_strusage);
+ log_set_prefix ("gpgv", 1);
+
+ /* Make sure that our subsystems are ready. */
+ init_common_subsystems ();
+
+ gnupg_init_signals (0, NULL);
+ i18n_init();
+
+ opt.command_fd = -1; /* no command fd */
+ opt.pgp2_workarounds = 1;
+ opt.keyserver_options.options|=KEYSERVER_AUTO_KEY_RETRIEVE;
+ opt.trust_model = TM_ALWAYS;
+ opt.batch = 1;
+
+ opt.homedir = default_homedir ();
+
+ tty_no_terminal(1);
+ tty_batchmode(1);
+ disable_dotlock();
+
+ pargs.argc = &argc;
+ pargs.argv = &argv;
+ pargs.flags= 1; /* do not remove the args */
+ while (optfile_parse( NULL, NULL, &configlineno, &pargs, opts))
+ {
+ switch (pargs.r_opt)
+ {
+ case oQuiet: opt.quiet = 1; break;
+ case oVerbose:
+ opt.verbose++;
+ opt.list_sigs=1;
+ gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
+ break;
+ case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
+ case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
+ case oLoggerFD:
+ log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));
+ break;
+ case oHomedir: opt.homedir = pargs.r.ret_str; break;
+ case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
+ default : pargs.err = ARGPARSE_PRINT_ERROR; break;
}
}
-
- if( log_get_errorcount(0) )
- g10_exit(2);
-
- if( opt.verbose > 1 )
- set_packet_list_mode(1);
-
- if( !nrings ) /* no keyring given: use default one */
- keydb_add_resource ("trustedkeys" EXTSEP_S "gpg", 0, 0);
- for(sl = nrings; sl; sl = sl->next )
- keydb_add_resource (sl->d, 0, 0 );
+
+ if (log_get_errorcount (0))
+ g10_exit(2);
+
+ if (opt.verbose > 1)
+ set_packet_list_mode(1);
+
+ if (!nrings) /* no keyring given: use default one */
+ keydb_add_resource ("trustedkeys" EXTSEP_S "gpg", 0, 0);
+ for (sl = nrings; sl; sl = sl->next)
+ keydb_add_resource (sl->d, 0, 0 );
- FREE_STRLIST (nrings);
+ FREE_STRLIST (nrings);
- if( (rc = verify_signatures( argc, argv ) ))
- log_error("verify signatures failed: %s\n", g10_errstr(rc) );
-
- /* cleanup */
- g10_exit(0);
- return 8; /*NEVER REACHED*/
+ if ( (rc = verify_signatures( argc, argv ) ))
+ log_error("verify signatures failed: %s\n", g10_errstr(rc) );
+
+ /* cleanup */
+ g10_exit (0);
+ return 8; /*NOTREACHED*/
}
void
g10_exit( int rc )
{
- rc = rc? rc : log_get_errorcount(0)? 2 :
- g10_errors_seen? 1 : 0;
- exit(rc );
+ rc = rc? rc : log_get_errorcount(0)? 2 : g10_errors_seen? 1 : 0;
+ exit(rc );
}
diff --git a/po/ChangeLog b/po/ChangeLog
index ae2a5a0c4..08fa0bcce 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-13 Werner Koch <[email protected]>
+
+ * de.po: Udpate.
+
2008-09-30 David Ammouial <[email protected]> (wk)
* fr.po: Fix bug #922.
diff --git a/po/be.po b/po/be.po
index 16cb05a22..f16144fcd 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
"Language-Team: Belarusian <[email protected]>\n"
@@ -91,7 +91,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -101,12 +101,12 @@ msgstr ""
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr ""
@@ -299,14 +299,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "шматслоўнасьць"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "працаваць менш шматслоўна"
@@ -318,7 +318,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr ""
@@ -385,7 +385,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -402,30 +402,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
@@ -1419,7 +1419,7 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr ""
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "немагчыма адкрыць \"%s\"\n"
@@ -1719,7 +1719,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1727,35 +1727,37 @@ msgstr ""
"@Загады:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[файл]|зрабіць подпіс"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "зрабіць адчэплены подпіс"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "зрабіць адчэплены подпіс"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "зашыфраваць даньні"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "разшыфраваць даньні (дапомна)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "праверыць подпіс"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "паказаць сьпіс ключоў"
@@ -1768,11 +1770,11 @@ msgstr "паказаць сьпіс ключоў і подпісаў"
msgid "list and check key signatures"
msgstr "праверыць подпісы ключа"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "паказаць сакрэтныя ключы"
@@ -1780,79 +1782,79 @@ msgstr "паказаць сакрэтныя ключы"
msgid "generate a new key pair"
msgstr "стварыць новую пару ключоў"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "падпісаць ключ"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "падпісаць ключ толькі мясцова"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "падпісаць ці рэдагаваць ключ"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr ""
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "экспарт ключоў"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "экспартаваць ключы на паслужнік ключоў"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "імпартаваць ключы з паслужніка ключоў"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr ""
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "абнавіць усе ключы з паслужніка ключоў"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "імпартаваць/аб'яднаць ключы"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr ""
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+msgid "print message digests"
msgstr ""
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1863,47 +1865,44 @@ msgstr ""
"Выбары:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr ""
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ІМЯ| зашыфраваць для вылучанай асобы"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+msgid "|N|set compress level to N (0 disables)"
msgstr ""
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr ""
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
msgid "|FILE|write output to FILE"
msgstr ""
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "не рабіць ніякіх зьменаў"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "пытацца перад перазапісам"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1911,7 +1910,7 @@ msgstr ""
"@\n"
"(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1931,15 +1930,15 @@ msgstr ""
" --list-keys [назвы] паказаць ключы\n"
" --fingerprint [назвы] паказаць адбіткі пальцаў\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1949,7 +1948,7 @@ msgstr ""
"sign, check, encrypt ці decrypt\n"
"Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1957,573 +1956,573 @@ msgstr ""
"\n"
"Альгарытмы, якія падтрымліваюцца:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr ""
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr ""
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr ""
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr ""
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "Выкарыстаньне: gpg [выбары] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "несумяшчальныя загады\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "невядомая вэрсыя"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr ""
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr ""
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr ""
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr ""
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr ""
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr ""
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не дазваляецца разам з %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ня мае сэнсу разам з %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "запіс у stdout\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr ""
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr ""
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr ""
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr ""
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "недапушчальныя дапомныя перавагі\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr ""
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr ""
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr ""
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ня мае сэнсу разам з %s!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr ""
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [назва_файла]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [назва_файла]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [назва_файла]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [назва_файла]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва_файла]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [назва_файла]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [назва_файла]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [загады]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr ""
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr ""
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr ""
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[назва_файла]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr ""
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr ""
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr ""
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr ""
-#: g10/gpgv.c:72
+#: g10/gpgv.c:74
#, fuzzy
-msgid "take the keys from this keyring"
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr ""
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr ""
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6187,76 +6186,76 @@ msgstr ""
msgid "can't open fd %d: %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "сакрэтны ключ недаступны"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "памылка чытаньня файла"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "пароль занадта доўгі\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
msgid "missing argument"
msgstr ""
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "несумяшчальныя загады\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "недапушчальныя выбары імпартаваньня\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "непадтрымліваецца"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "недапушчальныя выбары імпартаваньня\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "непадтрымліваецца"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
@@ -6592,7 +6591,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
msgid "read options from file"
msgstr ""
@@ -7200,190 +7199,146 @@ msgstr "збой падпісаньня: %s\n"
msgid "no valid recipients given\n"
msgstr ""
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[файл]|зрабіць подпіс"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "паказаць сакрэтныя ключы"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "дрэнны сэртыфікат"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "дрэнны сэртыфікат"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "дрэнны сэртыфікат"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "дрэнны пароль"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
msgid "create base-64 encoded output"
msgstr ""
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-#, fuzzy
-msgid "|NAME|use NAME as default recipient"
-msgstr "|НАЗВА| задаць назву дапомнага сакрэтнага ключа"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr ""
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
msgid "|FILE|write an audit log to FILE"
msgstr ""
-#: sm/gpgsm.c:351
-#, fuzzy
-msgid "force v3 signatures"
-msgstr "праверыць подпісы ключа"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:361
+#: sm/gpgsm.c:297
#, fuzzy
-msgid "add this keyring to the list of keyrings"
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr ""
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|НАЗВА| задаць назву дапомнага сакрэтнага ключа"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ВУЗЕЛ| выкарыстоўваць гэты паслужнік для пошуку ключоў"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|НАЗВА| усталяваць мноства знакаў тэрмінала"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr ""
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ІМЯ| зашыфраваць для вылучанай асобы"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: sm/gpgsm.c:395
-#, fuzzy
-msgid "|N|use compress algorithm N"
-msgstr "невядомы альгарытм сьцісканьня"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7394,60 +7349,60 @@ msgstr ""
"sign, check, encrypt ці decrypt\n"
"Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "Выкарыстаньне: gpg [выбары] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "невядомая вэрсыя"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr ""
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7775,6 +7730,10 @@ msgstr ""
msgid "do not allow the reuse of old passphrases"
msgstr "Паўтарыце пароль\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|НАЗВА| задаць назву дапомнага сакрэтнага ключа"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8104,6 +8063,35 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[файл]|зрабіць подпіс"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[файл]|зрабіць подпіс"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
+
+#, fuzzy
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|НАЗВА| задаць назву дапомнага сакрэтнага ключа"
+
+#, fuzzy
+#~ msgid "force v3 signatures"
+#~ msgstr "праверыць подпісы ключа"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|НАЗВА| усталяваць мноства знакаў тэрмінала"
+
+#, fuzzy
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "невядомы альгарытм сьцісканьня"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
@@ -8216,10 +8204,6 @@ msgstr ""
#~ msgstr "--nrlsign-key user-id"
#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "зрабіць адчэплены подпіс"
-
-#, fuzzy
#~ msgid "generate"
#~ msgstr "агульная памылка"
diff --git a/po/ca.po b/po/ca.po
index 3fdfe3773..2e9e1271e 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
@@ -113,7 +113,7 @@ msgstr "la contrasenya és errònia"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -123,12 +123,12 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -326,14 +326,14 @@ msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detall"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "una mica més silenciós"
@@ -345,7 +345,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
@@ -416,7 +416,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -433,30 +433,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
@@ -1501,7 +1501,7 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona per a aquesta ordre\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
@@ -1831,7 +1831,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1839,35 +1839,37 @@ msgstr ""
"@Ordres:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[fitxer]|crea una signatura"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "crea una signatura separada"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "xifra dades"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verifica una signatura"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "llista claus"
@@ -1882,11 +1884,11 @@ msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "llista claus secretes"
@@ -1894,79 +1896,80 @@ msgstr "llista claus secretes"
msgid "generate a new key pair"
msgstr "genera un nou parell de claus"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell públic"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "elimina claus de l'anell secret"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "signa una clau"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "signa una clau localment"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "signa o edita una clau"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocació"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exporta claus"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exporta claus a un servidor de claus"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importa claus d'un servidor de claus"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "cerca claus en un servidor de claus"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "actualitza totes les claus des d'un servidor de claus"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importa/fon claus"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "actualitza la base de dades de confiança"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1977,48 +1980,47 @@ msgstr ""
"Opcions:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOM|xifra per a NOM"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivell de compressió N (0 no comprimeix)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "no fa cap canvi"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "pregunta abans de sobreescriure"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -2029,7 +2031,7 @@ msgstr ""
# Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
# en el manual original de PGP. A, B, C... ivb
# En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -2049,15 +2051,15 @@ msgstr ""
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2072,7 +2074,7 @@ msgstr ""
# Precissament acabem de parlar d'«implementat a la llista del GNOME
# i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
# encara no m'agraden massa... jm
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2080,592 +2082,593 @@ msgstr ""
"\n"
"Algoritmes suportats:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Clau pública: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Xifratge: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Dispersió: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Compressió: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "forma d'ús: gpg [opcions] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
# Indi. ivb
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
# Indi. ivb
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
# Indi. ivb
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la URL de política de signatura donada no és vàlida\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra en quin anell de claus està una clau llistada"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s no és per a ús normal!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s no és un joc de caràcters vàlid\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s no és un joc de caràcters vàlid\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la URL de política de signatura donada no és vàlida\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "no s'ha pogut fixar l'exec-path a %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "AVÍS: el programa podria crear un fitxer core!\n"
# FIXME: preferència? jm
# Ho discutírem en la llista, segur. Deu ser als arxius. ivb
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
# clares -> en clar? ivb
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
"habilitat.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [nom_del_fitxer]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [nom_del_fitxer]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [nom_del_fitxer]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [nom_del_fitxer]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [nom_del_fitxer]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [ordres]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[nom_del_fitxer]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "la URL de política de certificació donada no és vàlida\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "pren les claus d'aquest anell"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "fes els conflictes de marques de temps només un avís"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|escriu informació d'estat en aquest FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
# Werner FIXME: should it use «Usage»?
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6663,31 +6666,31 @@ msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
msgid "can't open fd %d: %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
msgid "argument not expected"
msgstr ""
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "error de lectura"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "la línia és massa llarga\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "l'argument és invàlid"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "les ordres entren en conflicte\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "opcions d'importació no vàlides\n"
@@ -6696,37 +6699,37 @@ msgstr "opcions d'importació no vàlides\n"
# Probablement és una clau, femení. jm
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "no forçat"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "opcions d'importació no vàlides\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "L'ordre no és vàlida (proveu «help»)\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
@@ -6735,12 +6738,12 @@ msgstr ""
# Probablement és una clau, femení. jm
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "no forçat"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "opcions d'importació no vàlides\n"
@@ -7078,7 +7081,7 @@ msgstr "Introduïu el nom d'usuari: "
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "s'estan llegint opcions de «%s»\n"
@@ -7723,187 +7726,147 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
msgid "no valid recipients given\n"
msgstr "(No es va donar una descripció)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[fitxer]|crea una signatura"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[fitxer]|crea una signatura en text clar"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "llista claus secretes"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "Certificat de revocació vàlid"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "Certificat correcte"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "Certificat correcte"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "canvia la contrasenya"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea eixida amb armadura ascii"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOM|usa NOM com a destinatari predeterminat"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "usa la clau predeterminada com a destinatari predeterminat"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "no usa el terminal en absolut"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "força signatures v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "sempre utilitza un MDC per a xifrar"
-
# Mode desatès (SC) ivb
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "mode desatès: no pregunta mai"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "suposa «sí» en la majoria de les preguntes"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "suposa «no» en la majoria de les preguntes"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "afegeix aquest anell a la llista"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "afegeix aquest anell secret a la llista"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOM|usa NOM com a clau secreta predeterminada"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|usa aquest servidor per a cercar claus"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOM|el joc de caràcters serà NOM"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FITXER|carrega el mòdul d'extensió especificat"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|usa l'algoritme de xifratge NOM"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|usa l'algoritme de compressió N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7914,61 +7877,61 @@ msgstr ""
"signa, comprova, xifra o desxifra\n"
"l'operació predeterminada depén de les dades introduïdes\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "forma d'ús: gpg [opcions] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "no s'ha pogut connectar amb «%s»: %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(No es va donar una descripció)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = omet aquesta clau\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
# No em passe! ;) ivb
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8299,6 +8262,10 @@ msgstr "|N|usa el mode de contrasenya especificat"
msgid "do not allow the reuse of old passphrases"
msgstr "error en la creació de la contrasenya: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOM|usa NOM com a clau secreta predeterminada"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8633,6 +8600,38 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[fitxer]|crea una signatura"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[fitxer]|crea una signatura en text clar"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOM|usa NOM com a destinatari predeterminat"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usa la clau predeterminada com a destinatari predeterminat"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "força signatures v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "sempre utilitza un MDC per a xifrar"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "afegeix aquest anell secret a la llista"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOM|el joc de caràcters serà NOM"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usa l'algoritme de compressió N"
+
+#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "elimina claus de l'anell públic"
diff --git a/po/cs.po b/po/cs.po
index 61f7266cb..6349212d8 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2004-11-26 09:12+0200\n"
"Last-Translator: Roman Pavlik <[email protected]>\n"
"Language-Team: Czech <[email protected]>\n"
@@ -94,7 +94,7 @@ msgstr "�patn� heslo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann� algoritmus %d nen� podporov�n\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -104,12 +104,12 @@ msgstr "nemohu vytvo�it `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nemohu otev��t `%s': %s\n"
@@ -303,14 +303,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "s dodate�n�mi informacemi"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "b�t o trochu v�c tich�"
@@ -322,7 +322,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "�tu mo�nosti z `%s'\n"
@@ -392,7 +392,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -411,30 +411,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "soubor s mo�nostmi `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "�tu mo�nosti z `%s'\n"
@@ -1427,7 +1427,7 @@ msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output pro tento p��kaz nen� platn�\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "nelze otev��t `%s'\n"
@@ -1736,7 +1736,7 @@ msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1744,35 +1744,37 @@ msgstr ""
"@P��kazy:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[soubor]|vytvo�it podpis"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "vytvo�it podpis odd�len� od dokumentu"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "�ifrovat data"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "�ifrov�n� pouze se symetrickou �ifrou"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "de�ifrovat data (implicitn�)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verifikovat podpis"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "vypsat seznam kl���"
@@ -1784,11 +1786,11 @@ msgstr "vypsat seznam kl��� a podpis�"
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy kl���"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "vypsat seznam kl��� a fingerprint�"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "vypsat seznam tajn�ch kl���"
@@ -1796,79 +1798,80 @@ msgstr "vypsat seznam tajn�ch kl���"
msgid "generate a new key pair"
msgstr "vytvo�it nov� p�r kl���"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "odstranit kl�� ze souboru tajn�ch kl���"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "podepsat kl��"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "podepsat kl�� lok�ln�"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat kl��"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "vytvo�it revoka�n� certifik�t"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exportovat kl��e"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exportovat kl��e na server kl���"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importovat kl��e ze serveru kl���"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "vyhledat kl��e na serveru kl���"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "aktualizovat v�echny kl��e ze serveru kl���"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importovat/slou�it kl��e"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "vytisknout stav karty"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "zm�nit data na kart�"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "zm�nit PIN karty"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "aktualizovat datab�zi d�v�ry"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [soubory] vypi� hash"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1879,52 +1882,51 @@ msgstr ""
"Mo�nosti:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|JM�NO|�ifrovat pro JM�NO"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"pou��t tento id u�ivatele pro podeps�n�\n"
" nebo de�ifrov�n�"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
" komprimace)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "pou��t kanonick� textov� m�d"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "�tu mo�nosti z `%s'\n"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "neprov�d�t ��dn� zm�ny"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "pou��t chov�n� striktn� podle OpenPGP"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1932,7 +1934,7 @@ msgstr ""
"@\n"
"(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1950,17 +1952,17 @@ msgstr ""
" --list-keys [jm�na] vypsat kl��e\n"
" --fingerprint [jm�na] vypsat fingerprinty \n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
"P�ipom�nky k p�ekladu <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1970,7 +1972,7 @@ msgstr ""
"podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
"implicitn� operace z�vis� na vstupn�ch datech\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1978,83 +1980,83 @@ msgstr ""
"\n"
"Podporovan� algoritmy:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Ve�ejn� kl��: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "�ifra: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Komprese: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "u�it�: gpg [mo�nosti]"
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "konfliktn� p��kazy\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no = podpis nalezen v definici skupiny `%s'\n"
# g10/g10.c:1179#, c-format
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
"nebezpe�n� `%s'\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2062,21 +2064,21 @@ msgstr ""
"VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
"nebezpe�n� `%s'\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
"nebezpe�n� `%s'\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
"bezpe�n� `%s'\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2084,7 +2086,7 @@ msgstr ""
"VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
"nastavena bezpe�n� `%s'\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
@@ -2092,483 +2094,484 @@ msgstr ""
"nastavena bezpe�n� `%s'\n"
# c-format
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' nen� platn� doba expirace podpisu\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' nen� platn� znakov� sada\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru kl���\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parametr pro server kl���\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "neplatn� parametr pro server kl���\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parametr pro import\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "neplatn� parametr pro import\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parametr pro export\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "neplatn� parametr pro export\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parametr pro v�pis\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "neplatn� parametr pro v�pis\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nen� platn� doba expirace podpisu\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nen� platn� doba expirace podpisu\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' nen� platn� doba expirace podpisu\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "neplatn� parametr pro ov��en�\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROV�N�: %s p�ep��e %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nen� dovoleno pou��vat %s s %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�v� s %s smysl!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
"jako text\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
"2 nebo 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
"nebo 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� p�edvolby\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud nen� funk�n� s %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [jm�no souboru]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [jm�no souboru]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [jm�no souboru]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [jm�no souboru]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [jm�no souboru]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [jm�no souboru]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [jm�no souboru]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jm�no souboru]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [jm�no souboru]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [jm�no souboru]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key id u�ivatele"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key id u�ivatele"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u�ivatele [p��kazy]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "export kl��e se nepoda�il: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh dat na keyserveru se nezda�il: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[jm�no souboru]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Za�n�te ps�t svou zpr�vu ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "ber kl��e z t�to kl��enky (keyringu)"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|zapsat informace o stavu do tohoto FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6358,77 +6361,77 @@ msgstr "vstupn� ��dek %u je p��li� dlouh� nebo na konci chyb� znak LF\n"
msgid "can't open fd %d: %s\n"
msgstr "nemohu otev��t `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "administr�torsk� p��kazy nejsou povoleny\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "chyba p�i �ten� souboru"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "��dek je p��li� dlouh�"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "neplatn� argument"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "pouze administr�torsk� p��kazy\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "neplatn� parametr pro v�pis\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "nen� vy�adov�no"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "neplatn� parametr pro v�pis\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "nen� vy�adov�no"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "neplatn� parametr pro v�pis\n"
@@ -6766,7 +6769,7 @@ msgstr "|N|Nov� PIN"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "�tu mo�nosti z `%s'\n"
@@ -7384,194 +7387,147 @@ msgstr "smaz�n� bloku kl��e se nezda�ilo: %s\n"
msgid "no valid recipients given\n"
msgstr "(Nebyl zad�n ��dn� popis)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[soubor]|vytvo�it podpis"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "vypsat seznam tajn�ch kl���"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "�patn� certifik�t"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "�patn� certifik�t"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "�patn� certifik�t"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
#, fuzzy
msgid "register a smartcard"
msgstr "p�idat kl�� na kartu"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "zm�nit heslo"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr ""
-
-#: sm/gpgsm.c:329
-#, fuzzy
-msgid "use the default key as default recipient"
-msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "�tu mo�nosti z `%s'\n"
-#: sm/gpgsm.c:351
-#, fuzzy
-msgid "force v3 signatures"
-msgstr "kontrolovat podpisy"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr ""
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:361
+#: sm/gpgsm.c:297
#, fuzzy
-msgid "add this keyring to the list of keyrings"
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "ber kl��e z t�to kl��enky (keyringu)"
-#: sm/gpgsm.c:362
-#, fuzzy
-msgid "add this secret keyring to the list"
-msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:365
-#, fuzzy
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|JM�NO|�ifrovat pro JM�NO"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr ""
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "nezn�m� �ifrovac� algoritmus"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "podpis %s, hashovac� algoritmus %s\n"
-#: sm/gpgsm.c:395
-#, fuzzy
-msgid "|N|use compress algorithm N"
-msgstr "nezn�m� komprima�n� algoritmus"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7582,60 +7538,60 @@ msgstr ""
"podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
"implicitn� operace z�vis� na vstupn�ch datech\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "u�it�: gpg [mo�nosti]"
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "nemohu se p�ipojit k `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "nezn�m� volba `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Nebyl zad�n ��dn� popis)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = p�esko�it tento kl��\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nelze zpracovat URL serveru kl���\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nemohu otev��t `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7964,6 +7920,10 @@ msgstr "revokovat kl�� nebo vybran� podkl��e"
msgid "do not allow the reuse of old passphrases"
msgstr "chyba p�i vytv��en� hesla: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8298,6 +8258,38 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[soubor]|vytvo�it podpis"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
+
+#, fuzzy
+#~ msgid "use the default key as default recipient"
+#~ msgstr ""
+#~ "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
+
+#, fuzzy
+#~ msgid "force v3 signatures"
+#~ msgstr "kontrolovat podpisy"
+
+#, fuzzy
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
+
+#, fuzzy
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|JM�NO|�ifrovat pro JM�NO"
+
+#, fuzzy
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "nezn�m� komprima�n� algoritmus"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
diff --git a/po/da.po b/po/da.po
index b7107ed8b..bc248036b 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
@@ -92,7 +92,7 @@ msgstr "d�rlig kodes�tning"
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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "kan ikke oprette %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke �bne '%s': %s\n"
@@ -303,14 +303,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "meddelsom"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "v�r mere stille"
@@ -322,7 +322,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|indl�s udvidelsesmodul FILE"
@@ -392,7 +392,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -409,30 +409,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "l�ser indstillinger fra `%s'\n"
@@ -1440,7 +1440,7 @@ msgstr ""
msgid "--output doesn't work for this command\n"
msgstr ""
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "kan ikke �bne `%s'\n"
@@ -1741,7 +1741,7 @@ msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1749,35 +1749,37 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[filer]|opret en signatur"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "opret en separat signatur"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[filer]|opret rentekst signatur"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "opret en separat signatur"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "krypt�r data"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "krypt�r kun med symmetriske cifre"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "afkrypt�r data (standard)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "godkend en signatur"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "vis n�gler"
@@ -1790,11 +1792,11 @@ msgstr "vis n�gler og signaturer"
msgid "list and check key signatures"
msgstr "tjek n�glesignaturer"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "vis n�gle og fingeraftryk"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "vis hemmelige n�gler"
@@ -1802,83 +1804,84 @@ msgstr "vis hemmelige n�gler"
msgid "generate a new key pair"
msgstr "gener�r et nyt n�glepar"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
#, fuzzy
msgid "remove keys from the public keyring"
msgstr "fjern n�gle fra den offentlige n�glering"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
#, fuzzy
msgid "remove keys from the secret keyring"
msgstr "fjern n�gle fra den hemmelige n�glering"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "sign�r en n�gle"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "sign�r en n�gle lokalt"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "sign�r eller redig�r en n�gle"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "eksport�r n�gler"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
#, fuzzy
msgid "search for keys on a key server"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "import�r/fusion�r n�gler"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "opdat�r tillidsdatabasen"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [filer]|print meddelelsesresum�"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1889,54 +1892,53 @@ msgstr ""
"Indstillinger:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "opret ascii beskyttet uddata"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAME|krypt�r for NAME"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "brug denne bruger-id til at signere eller dekryptere"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "brug kanonisk tekstmodus"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|indl�s udvidelsesmodul FILE"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "lav ingen �ndringer"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr ""
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1956,16 +1958,16 @@ msgstr ""
" --list-keys [navne] vis n�gler\n"
" --fingerprint [navne] vis fingeraftryk\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
# Skal alt dette overs�ttes eller er det flagene?
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1975,7 +1977,7 @@ msgstr ""
"sign, check, encrypt eller decrypt\n"
"standard operation afh�nger af inddata\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1983,594 +1985,594 @@ msgstr ""
"\n"
"Underst�ttede algoritmer:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr ""
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr ""
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr ""
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
#, fuzzy
msgid "Compression: "
msgstr "Kommentar: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "brug: gpg [flag] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "konfliktende kommandoer\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "ukendt standard modtager '%s'\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr ""
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "skift imellem hemmelig og offentlig n�gle visning"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr ""
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTITS: %s er ikke til normal brug!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "import�r n�gler fra en n�gleserver: %s\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "ugyldig n�glering"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
#, fuzzy
msgid "invalid import options\n"
msgstr "ugyldig rustning"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
#, fuzzy
msgid "invalid export options\n"
msgstr "ugyldig n�glering"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "ugyldig rustning"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "ugyldig n�glering"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsl�s sammen med %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "valgte resum�algoritme er ugyldig\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgte resum�algoritme er ugyldig\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr ""
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr ""
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr ""
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
#, fuzzy
msgid "invalid default preferences\n"
msgstr "vis pr�ferencer"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "vis pr�ferencer"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "vis pr�ferencer"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "vis pr�ferencer"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s er meningsl�s sammen med %s!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
# er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [filnavn (som gemmes)]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn (som krypteres)]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [filnavn (som signeres)]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn (som dekrypteres)]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr ""
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hash-algoritme `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[filnavn]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "G� til sagen og skriv meddelelsen ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
#, fuzzy
msgid "the given certification policy URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
#, fuzzy
msgid "the given signature policy URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpgv.c:72
+#: g10/gpgv.c:74
#, fuzzy
-msgid "take the keys from this keyring"
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "Slet denne n�gle fra n�gleringen? "
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "tidsstempelkonflikt"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinfo til denne FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6339,76 +6341,76 @@ msgstr ""
msgid "can't open fd %d: %s\n"
msgstr "kan ikke �bne '%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "fill�sningsfejl"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
msgid "keyword too long"
msgstr ""
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "ugyldigt argument"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "konfliktende kommandoer\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "ugyldig rustning"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "ikke bearbejdet"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "ugyldig rustning"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, c-format
msgid "invalid command \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "ikke bearbejdet"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "ugyldig rustning"
@@ -6748,7 +6750,7 @@ msgstr "Indtast bruger-id: "
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "l�ser indstillinger fra `%s'\n"
@@ -7364,187 +7366,147 @@ msgstr "fjernelse af beskyttelse fejlede: %s\n"
msgid "no valid recipients given\n"
msgstr "ingen gyldige adresser\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[filer]|opret en signatur"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[filer]|opret rentekst signatur"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "vis hemmelige n�gler"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "ugyldigt certifikat"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "Godt certifikat"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "Godt certifikat"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "�ndr kodes�tningen"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "opret ascii beskyttet uddata"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAME|brug NAME som standard modtager"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "brug standard n�glen som standard modtager"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "brug overhovedet ikke terminalen"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|indl�s udvidelsesmodul FILE"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "tving v3 signaturer"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "brug altid en MDC for kryptering"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "k�rselsmodus: sp�rg aldrig"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "forvent ja til de fleste spr�gsm�l"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "forvent nej til de fleste spr�gsm�l"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "tilf�j denne n�glering til n�gleringslisten"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "tilf�j denne hemmeligen�glering til listen"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NAME|brug NAME som standard hemmelign�gle"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|s�t terminal karakters�t til NAME"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FILE|indl�s udvidelsesmodul FILE"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|brug cifferalgoritme NAME"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|brug kompresalgoritme N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
# Skal alt dette overs�ttes eller er det flagene?
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7555,60 +7517,60 @@ msgstr ""
"sign, check, encrypt eller decrypt\n"
"standard operation afh�nger af inddata\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "brug: gpg [flag] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "kan ikke �bne '%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "ukendt standard modtager '%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s: udelod: %s\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "import�r n�gler fra en n�gleserver: %s\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "skriver til `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan ikke �bne '%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7940,6 +7902,10 @@ msgstr "|N|brug pasfrasemodus N"
msgid "do not allow the reuse of old passphrases"
msgstr "fejl ved oprettelse af kodes�tning: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|brug NAME som standard hemmelign�gle"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8271,6 +8237,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[filer]|opret en signatur"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[filer]|opret en signatur"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[filer]|opret rentekst signatur"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAME|brug NAME som standard modtager"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "brug standard n�glen som standard modtager"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "tving v3 signaturer"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "brug altid en MDC for kryptering"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "tilf�j denne hemmeligen�glering til listen"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAME|s�t terminal karakters�t til NAME"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FILE|indl�s udvidelsesmodul FILE"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|brug kompresalgoritme N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "fjern n�gle fra den offentlige n�glering"
@@ -8589,10 +8590,6 @@ msgstr ""
#~ msgstr "--sign-key bruger-id"
#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "opret en separat signatur"
-
-#, fuzzy
#~ msgid "sign the key non-revocably"
#~ msgstr "sign�r n�glen lokalt"
diff --git a/po/de.po b/po/de.po
index bf52599e3..d41931e54 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
-"PO-Revision-Date: 2008-11-04 18:44+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"PO-Revision-Date: 2008-11-13 12:50+0100\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -96,7 +96,7 @@ msgstr "Passphrase"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -106,12 +106,12 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -181,21 +181,19 @@ msgstr "Admin-PIN"
#: agent/divert-scd.c:224
msgid "Reset Code"
-msgstr ""
+msgstr "Rückstellcode"
#: agent/divert-scd.c:284
-#, fuzzy
msgid "Repeat this Reset Code"
-msgstr "PIN bitte wiederholen"
+msgstr "Rückstellcode bitte wiederholen"
#: agent/divert-scd.c:285
msgid "Repeat this PIN"
msgstr "PIN bitte wiederholen"
#: agent/divert-scd.c:290
-#, fuzzy
msgid "Reset Code not correctly repeated; try again"
-msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
+msgstr "Rückstellcode wurde nicht richtig wiederholt; noch einmal versuchen"
#: agent/divert-scd.c:291
msgid "PIN not correctly repeated; try again"
@@ -233,8 +231,12 @@ msgid ""
msgid_plural ""
"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
"at least %u characters long."
-msgstr[0] "WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. Eine Passphrase sollte%%0Amindestens %u Zeichen lang sein."
-msgstr[1] "WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. Eine Passphrase sollte%%0Amindestens %u Zeichen lang sein."
+msgstr[0] ""
+"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. "
+"Eine Passphrase sollte%%0Amindestens %u Zeichen lang sein."
+msgstr[1] ""
+"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. "
+"Eine Passphrase sollte%%0Amindestens %u Zeichen lang sein."
#: agent/genkey.c:214
#, c-format
@@ -250,8 +252,7 @@ msgstr[0] ""
"enthalten."
msgstr[1] ""
"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. "
-"Eine Passphrase sollte%%0Amindestens %u Sonderzeichen oder Ziffern "
-"enthalten."
+"Eine Passphrase sollte%%0Amindestens %u Sonderzeichen oder Ziffern enthalten."
#: agent/genkey.c:237
#, c-format
@@ -311,14 +312,14 @@ msgstr "Im Server Modus ausführen"
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "Reduzierte Informationen"
@@ -330,7 +331,7 @@ msgstr "Ausgabe für /bin/sh"
msgid "csh-style command output"
msgstr "Ausgabe für /bin/csh"
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
@@ -395,7 +396,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Fehlerberichte bitte an <"
@@ -412,30 +413,30 @@ msgstr ""
"Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für GnuPG\n"
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "ungültige Debugebene `%s' angegeben\n"
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
@@ -1124,14 +1125,12 @@ msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
#: g10/card-util.c:83
-#, fuzzy
msgid "This command is only available for version 2 cards\n"
-msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
+msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
#: g10/card-util.c:85 scd/app-openpgp.c:1848
-#, fuzzy
msgid "Reset Code not or not anymore available\n"
-msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
+msgstr "Der Rückstellcode ist nicht vorhanden\n"
#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1597
@@ -1391,7 +1390,7 @@ msgstr "überprüfe die PIN und liste alle Daten auf"
#: g10/card-util.c:1415
msgid "unblock the PIN using a Reset Code"
-msgstr ""
+msgstr "die PIN mit dem Rückstellcode wieder freigeben"
#: g10/card-util.c:1537 g10/keyedit.c:1654
msgid "Command> "
@@ -1417,7 +1416,7 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Befehl\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
@@ -1736,7 +1735,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1744,35 +1743,35 @@ msgstr ""
"@Befehle:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[Datei]|Eine Unterschrift erzeugen"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+msgid "make a signature"
+msgstr "Eine Unterschrift erzeugen"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
-msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+msgid "make a clear text signature"
+msgstr "Eine Klartextunterschrift erzeugen"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "Daten verschlüsseln"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlüsseln"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "Daten entschlüsseln (Voreinstellung)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "Signatur prüfen"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "Liste der Schlüssel"
@@ -1784,11 +1783,11 @@ msgstr "Liste der Schlüssel und ihrer Signaturen"
msgid "list and check key signatures"
msgstr "Signaturen der Schlüssel auflisten und prüfen"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
@@ -1796,79 +1795,79 @@ msgstr "Liste der geheimen Schlüssel"
msgid "generate a new key pair"
msgstr "Ein neues Schlüsselpaar erzeugen"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "Schlüssel signieren"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "Schlüssel nur für diesen Rechner signieren"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "Unterschreiben oder bearbeiten eines Schl."
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "Schlüssel exportieren"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "Schlüssel zu einem Schlü.server exportieren"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "Schlüssel von einem Schlü.server importieren"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "Schlüssel auf einem Schlü.server suchen"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "alle Schlüssel per Schlü.server aktualisieren"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "Schlüssel importieren/kombinieren"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "den Karten-Status ausgeben"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "Daten auf einer Karte ändern"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "PIN einer Karte ändern"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "Ändern der \"Trust\"-Datenbank"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
-msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
+#: g10/gpg.c:431
+msgid "print message digests"
+msgstr "Hashwerte für die Dateien ausgeben"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
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
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1879,47 +1878,43 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-Hülle versehen"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
-msgstr "|NAME|Verschlüsseln für NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|Verschlüsseln für USER-ID"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
-msgstr "Mit dieser User-ID signieren"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
-msgstr "Kompressionsstufe auf N setzen (0=keine)"
+#: g10/gpg.c:457
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "vor Überschreiben nachfragen"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "OpenPGP-Verhalten strikt beachten"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1928,7 +1923,7 @@ msgstr ""
"(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
"Optionen)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1948,17 +1943,17 @@ msgstr ""
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Berichte über Programmfehler bitte in englisch an <[email protected]>.\n"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1968,7 +1963,7 @@ msgstr ""
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
"Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1976,77 +1971,77 @@ msgstr ""
"\n"
"Unterstützte Verfahren:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Öff. Schlüssel: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Verschlü.: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Komprimierung: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr "Verwendete Bibliotheken:"
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
"Verzeichnis `%s'\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2054,20 +2049,20 @@ msgstr ""
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei `%s'\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
"Verzeichnisses `%s'\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2075,495 +2070,495 @@ msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei `%s'\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
"Erweiterung `%s'\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr "Zeige IETF-Standard"
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
"Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n"
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' ist kein gültiger Zeichensatz\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "Ungültige Schlüsselserver-Option\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ungültige Import-Option\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "Ungültige Import-Option\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ungültige Export-Option.\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "Ungültige Export-Option\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ungültige Listen-Option.\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "Ungültige Listen-Option\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung"
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"Die URL für den bevorzugten Schlüsselserver während der "
"Unterschriftenprüfung anzeigen"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"Zeige widerrufene und verfallene User-IDs während der Unterschriftenprüfung"
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
msgid "show only the primary user ID in signature verification"
msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr "werte das Vertrauen zu Unterschriften durch gültige PKA-Daten auf"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "Ungültige Überprüfungs-Option\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
"machen\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
"verschlüsseln\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
"verwenden.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-"
"Verschlüsselung\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed müssen größer als 0 sein\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed müssen größer als 1 sein\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "ungültige Standard-Voreinstellungen\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "ungültige private Hashvoreinstellungen\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "ungültige private Komprimierungsvoreinstellungen\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
"erlaubt.\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [Dateiname]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [Dateiname]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [Dateiname]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
"werden\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "Schlüsselexport fehlgeschlagen: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[Dateiname]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
-msgstr "Schlüssel aus diesem Schlüsselbund nehmen"
-
#: g10/gpgv.c:74
+msgid "|FILE|take the keys from the keyring FILE"
+msgstr "|DATEI|Schlüssel aus der Schlüsselbund DATEI nehmen"
+
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "differierende Zeitangaben sind kein Fehler"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6435,70 +6430,68 @@ msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
msgid "can't open fd %d: %s\n"
msgstr "fd=%d kann nicht geöffnet werden: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
msgid "argument not expected"
msgstr "Argument nicht erwartet"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
msgid "read error"
msgstr "Lesefehler"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
msgid "keyword too long"
msgstr "Schlüsselwort ist zu lang"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
msgid "missing argument"
msgstr "Fehlendes Argument"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
msgid "invalid command"
msgstr "Ungültige Befehl"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
msgid "invalid alias definition"
msgstr "Ungültige Alias-Definition"
-#: jnlib/argparse.c:189
-#, fuzzy
+#: jnlib/argparse.c:192
msgid "out of core"
-msgstr "[Fehler - Nicht genügend Speicher]"
+msgstr "Nicht genügend Speicher"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
msgid "invalid option"
msgstr "Ungültige Option"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr "Fehlendes Argument für Option \"%.50s\"\n"
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr "Option \"%.50s\" erwartet kein Argument\n"
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Ungültiger Befehl \"%.50s\"\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr "Option \"%.50s\" ist mehrdeutig\n"
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
-#: jnlib/argparse.c:210
-#, fuzzy
+#: jnlib/argparse.c:213
msgid "out of core\n"
-msgstr "[Fehler - Nicht genügend Speicher]"
+msgstr "Nicht genügend Speicher\n"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "Ungültige Option \"%.50s\"\n"
@@ -6541,20 +6534,20 @@ msgstr "Fehler beim Schreiben von %s: %s\n"
#: jnlib/dotlock.c:454
#, c-format
msgid "removing stale lockfile (created by %d)\n"
-msgstr ""
+msgstr "eine übriggebliebene Sperrdatei wird entfernt (erzeugt von %d)\n"
#: jnlib/dotlock.c:460
msgid " - probably dead - removing lock"
-msgstr ""
+msgstr " - existiert wahrscheinlich nicht mehr - entferne Sperre"
#: jnlib/dotlock.c:470
#, c-format
msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr ""
+msgstr "warte auf die Freigabe der Sperre (gehalten von %d%s) %s...\n"
#: jnlib/dotlock.c:471
msgid "(deadlock?) "
-msgstr ""
+msgstr "(Deadlock?) "
#: jnlib/dotlock.c:494
#, c-format
@@ -6669,9 +6662,8 @@ msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
#: scd/app-openpgp.c:1488
-#, fuzzy
msgid "||Please enter the PIN"
-msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
+msgstr "||Bitte die PIN eingeben"
#: scd/app-openpgp.c:1499 scd/app-openpgp.c:1664
#, c-format
@@ -6722,18 +6714,17 @@ msgid "|A|Admin PIN"
msgstr "|A|Admin-PIN"
#: scd/app-openpgp.c:1853
-#, fuzzy
msgid "||Please enter the Reset Code for the card"
-msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
+msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
-#, fuzzy, c-format
+#, c-format
msgid "Reset Code is too short; minimum length is %d\n"
-msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
+msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
#: scd/app-openpgp.c:1896
msgid "|RN|New Reset Code"
-msgstr ""
+msgstr "|RN|Neuer Rückstellcode"
#: scd/app-openpgp.c:1897
msgid "|AN|New Admin PIN"
@@ -6837,7 +6828,7 @@ msgstr "|N|Erstmalige neue PIN"
msgid "run in multi server mode (foreground)"
msgstr "Im Multiserver Modus ausführen"
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
msgid "read options from file"
msgstr "Konfigurationsoptionen aus Datei lesen"
@@ -7405,7 +7396,6 @@ msgid "Ready. You should now send this request to your CA.\n"
msgstr "Fertig. Sie sollten nun diese Anforderung an die CA senden.\n"
#: sm/certreqgen-ui.c:303
-#, fuzzy
msgid "resource problem: out of core\n"
msgstr "Resourcenproblem: Nicht genügend Hauptspeicher\n"
@@ -7446,177 +7436,135 @@ msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
msgid "no valid recipients given\n"
msgstr "Keine gültigen Empfänger angegeben\n"
-#: sm/gpgsm.c:248
-msgid "|[FILE]|make a signature"
-msgstr "|[DATEI]|Erzeuge eine Signatur"
-
-#: sm/gpgsm.c:249
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
msgid "list external keys"
msgstr "Externe Schlüssel anzeigen"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
msgid "list certificate chain"
msgstr "Schlüssel mit Zertifikatekette anzeigen"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
msgid "import certificates"
msgstr "Zertifikate importieren"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
msgid "export certificates"
msgstr "Zertifikate exportieren"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr "Smartcard registrieren"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr "Das Kommand an den Dirmngr durchreichen"
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr "Rufe das gpg-protect-tool auf"
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
msgid "change a passphrase"
msgstr "Die Passphrase ändern"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
msgid "create base-64 encoded output"
msgstr "Ausgabe im Basis-64 format erzeugen"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr "Eingabedaten sind im PEM Format"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr "Eingabedaten sind im Basis-64 Format"
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr "Eingabedaten sind im Binärformat"
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr "Benutze den System Dirmngr falls verfügbar"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr "Niemals eine CRL konsultieren"
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr "Die Gültigkeit mittels OCSP prüfen"
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr "|N|Sende N Zertifikate mit"
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr "Zertikikatrichtlinien nicht überprüfen"
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr "Fehlende Zertifikate automatisch holen"
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr ""
-"Den Standardschlüssel als voreingestellten\n"
-"Empfänger benutzen"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "das Terminal gar nicht benutzen"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
msgid "|FILE|write an audit log to FILE"
msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "v3 Signaturen erzwingen"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "Stapelmodus: Keine Abfragen"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "\"Ja\" als Standardantwort annehmen"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "\"Nein\" als Standardantwort annehmen"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
-msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
+#: sm/gpgsm.c:297
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "Als geheimen Schlüsselbund mitbenutzen"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
+#: sm/gpgsm.c:300
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|Terminalzeichensatz NAME benutzen"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Die Debugstufe auf NAME setzen"
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|DATEI|Erweiterungsmodul DATEI laden"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|Hashverfahren NAME benutzen"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|Komprimierverfahren N benutzen"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7625,58 +7573,58 @@ msgstr ""
"Syntax: gpgsm [Optionen] [Dateien]\n"
"Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
msgid "usage: gpgsm [options] "
msgstr "Aufruf: gpgsm [Optionen] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, c-format
msgid "unknown validation model `%s'\n"
msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: Kein Server-Name angegeben\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
-msgstr ""
+msgstr "%s:%u: Passwort ohne Benutzer\n"
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: Zeile wird übersprungen\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
msgid "could not parse keyserver\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "Importiere allgemeine Zertifikate: %s\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "Signieren mit `%s' nicht möglich: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr "Dieser Befehl wurde noch nicht implementiert\n"
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@ -7813,14 +7761,14 @@ msgstr ""
"Signatur erzeugen wird."
#: sm/sign.c:420
-#, fuzzy, c-format
+#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
-msgstr "Schutzverfahren %d%s wird nicht unterstützt\n"
+msgstr "Hashverfahren %d (%s) wird für Unterzeichner %d nicht unterstützt; %s wird benutzt\n"
#: sm/sign.c:433
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
-msgstr ""
+msgstr "Benutztes Hashverfahren für Unterzeichner %d: %s (%s)\n"
#: sm/sign.c:483
#, c-format
@@ -8010,13 +7958,17 @@ msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
msgid "do not allow the reuse of old passphrases"
msgstr "Verbiete die Wiedernutzung alter Passphrases."
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAME|Auch an NAME verschlüsseln"
#: tools/gpgconf-comp.c:664
msgid "|SPEC|set up email aliases"
-msgstr ""
+msgstr "|SPEC|Email Alias festlegen"
#: tools/gpgconf-comp.c:685
msgid "Configuration for Keyservers"
@@ -8337,6 +8289,41 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
+
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[DATEI]|Erzeuge eine Signatur"
+
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr ""
+#~ "Den Standardschlüssel als voreingestellten\n"
+#~ "Empfänger benutzen"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "v3 Signaturen erzwingen"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "Als geheimen Schlüsselbund mitbenutzen"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAME|Terminalzeichensatz NAME benutzen"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|DATEI|Erweiterungsmodul DATEI laden"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|Komprimierverfahren N benutzen"
+
#~ msgid "remove key from the public keyring"
#~ msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen"
diff --git a/po/el.po b/po/el.po
index ba7694517..f5c8098a5 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <[email protected]>\n"
"Language-Team: Greek <[email protected]>\n"
@@ -92,7 +92,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "�������� ����������� ��� `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
@@ -301,14 +301,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "���������"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "����� ������"
@@ -320,7 +320,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
@@ -391,7 +391,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -408,30 +408,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "��������: �� �������������� ������ �������� `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "������ �������� `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "�������� �������� ��� `%s'\n"
@@ -1453,7 +1453,7 @@ msgstr "�� ������ ������ (��������� \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output ��� ���������� ��� ���� ��� ������\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
@@ -1779,7 +1779,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1787,35 +1787,37 @@ msgstr ""
"@�������:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[������]|���������� ���� ���������"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "���������� ���� �� ������������� ���������"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[������]|���������� ���� �� ���������������� ���������"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "���������� ���� �� ������������� ���������"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "������������� ���������"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "������������� �� ����� ���� ����������� ����������"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "���������������� ��������� (��������������)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "���������� ���� ���������"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "���������� ��� ������ ��������"
@@ -1828,11 +1830,11 @@ msgstr "���������� ��� ������ �������� ��� ���������"
msgid "list and check key signatures"
msgstr "������� ��������� ��������"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "���������� ��� ������ �������� ��������"
@@ -1840,79 +1842,80 @@ msgstr "���������� ��� ������ �������� ��������"
msgid "generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "�������� ���� ��������"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "�������� ���� �������� ������"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "�������� � ����������� ���� ��������"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "���������� ���� �������������� ���������"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "������� ��������"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "������� �������� �� ��� ���������� ��������"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "�������� �������� ��� ��� ���������� ��������"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "��������� �������� �� ��� ���������� ��������"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "��������/���������� ��������"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "�������� ��� ����� ��������� ������������"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|����� [������]| ���������� ���������� ��� ���������"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1923,48 +1926,47 @@ msgstr ""
"��������:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "���������� ascii ������������ ������"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|�����|������������� ��� �����"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|���������� �������� ��������� N (0 �������������)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "����� ��������� ���������� ��������"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "�� �� ����� ������ ������"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "������� ���� ��� ���������"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1972,7 +1974,7 @@ msgstr ""
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1992,15 +1994,15 @@ msgstr ""
" --list-keys [�������] ���������� ��������\n"
" --fingerprint [�������] ���������� ������������ (fingerprints)\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "��������� �� ���������� ��� <[email protected]>\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2010,7 +2012,7 @@ msgstr ""
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2018,593 +2020,594 @@ msgstr ""
"\n"
"��������������� ����������:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "�����������:"
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "���������������: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "��������: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "�����: gpg [��������] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "������������� �������\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "������� ����������� ��������� \"%s\"\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "�� ������� �������� ���������\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "�� ������� �������� ���������\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�������� ������� ��� exec-path �� %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
"���������\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"� ����������� ���������� ��������� ��� �����������\n"
"��� ����� �������\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "�� ������� �����������\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "�� ������� ����������� ���������� ���������������\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"�������������: ������� ���������� (-r) ����� ����� ��������������\n"
"�������� ��������\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [����� �������]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [����� �������]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "���������������� �������: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [����� �������]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [����� �������]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [����� �������]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [����� �������]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [����� �������]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [�������]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver ���� �������: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "������� �������� �������: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver ��������� �������: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "����������� �������: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�������� �������: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[����� �������]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "������� ��� �������� ��� ���� �� ����������"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|������� ��� ����������� ���������� ��� FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6533,77 +6536,77 @@ msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
msgid "can't open fd %d: %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "������� ��� �������� �������� ��� `%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "������ ��������� �������"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "� ������ ����� ���� ������\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "�� ������ ������"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "������������� �������\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "�� ������� �������� ���������\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "�� �������������"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "�� ������� �������� ���������\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "�� ������ ������ (��������� \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "�� �������������"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "�� ������� �������� ���������\n"
@@ -6940,7 +6943,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "�������� �������� ��� `%s'\n"
@@ -7561,186 +7564,146 @@ msgstr "�������� block �������� �������: %s\n"
msgid "no valid recipients given\n"
msgstr "(��� ������ ���������)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[������]|���������� ���� ���������"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[������]|���������� ���� �� ���������������� ���������"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "���������� ��� ������ �������� ��������"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "���� �������������"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "���� �������������"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "���� �������������"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "������ ��� ������ ������"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "���������� ascii ������������ ������"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|�����|����� ��� �������� �� ��������������� ���������"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "�� ����� ����������"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "������������ ������ v3 ���������"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "����� ������� MDC ��� �������������"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "��������� batch: �� �� �������� ���������"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "�������� ��� ���� ������������ ���������"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "�������� ��� ���� ������������ ���������"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "�������� ����� ��� �������� ����������� ��� �����"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|�����|����� �������� ��� �������������� ������� ������"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|������|������� ��� ���������� ��������� ������"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|�����|����� ���������� �������������� �����"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|�����|����� ���������� ��������� ��������� ����� "
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|����� ���������� ��������� N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7751,60 +7714,60 @@ msgstr ""
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "�����: gpg [��������] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "�������� �������� ��� `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(��� ������ ���������)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = ��������� ����� ��� ��������\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "������� ��� `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8135,6 +8098,10 @@ msgstr "|N|����� ��� ���������� ������ ������ N"
msgid "do not allow the reuse of old passphrases"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|�����|����� �������� ��� �������������� ������� ������"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8468,6 +8435,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[������]|���������� ���� ���������"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[������]|���������� ���� ���������"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[������]|���������� ���� �� ���������������� ���������"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|�����|����� ��� �������� �� ��������������� ���������"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "������������ ������ v3 ���������"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "����� ������� MDC ��� �������������"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "�������� ����� ��� �������� ����������� ��� �����"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|������|������� ��� ���������� ��������� ������"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|����� ���������� ��������� N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "�������� ��� �������� ��� �� ������� ����������"
@@ -9144,10 +9146,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key user-id"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "���������� ���� �� ������������� ���������"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "�������� ��� �������� ��-�����������"
diff --git a/po/eo.po b/po/eo.po
index a41ba2e5c..5a647a011 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
"Language-Team: Esperanto <[email protected]>\n"
@@ -92,7 +92,7 @@ msgstr "malbona pasfrazo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "ne povas krei '%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
@@ -302,14 +302,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detala eligo"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
@@ -321,7 +321,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
@@ -391,7 +391,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -408,30 +408,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
@@ -1460,7 +1460,7 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output ne funkcias por �i tiu komando\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "ne povas malfermi '%s'\n"
@@ -1767,7 +1767,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1775,35 +1775,37 @@ msgstr ""
"@Komandoj:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[dosiero]|fari subskribon"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "fari apartan subskribon"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "fari apartan subskribon"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "�ifri datenojn"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "kontroli subskribon"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "listigi �losilojn"
@@ -1816,11 +1818,11 @@ msgstr "listigi �losilojn kaj subskribojn"
msgid "list and check key signatures"
msgstr "kontroli �losilsubskribojn"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
@@ -1828,79 +1830,80 @@ msgstr "listigi sekretajn �losilojn"
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "forigi �losilojn de la publika �losilaro"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "forigi �losilojn de la sekreta �losilaro"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "subskribi �losilon"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "eksporti �losilojn"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "eksporti �losilojn al �losilservilo"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importi �losilojn de �losilservilo"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "ser�i �losilojn �e �losilservilo"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "aktualigi �iujn �losilojn de �losilservilo"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1911,48 +1914,47 @@ msgstr ""
"Opcioj:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOMO|�ifri por NOMO"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr ""
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1960,7 +1962,7 @@ msgstr ""
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1980,15 +1982,15 @@ msgstr ""
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1998,7 +2000,7 @@ msgstr ""
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2006,593 +2008,593 @@ msgstr ""
"\n"
"Realigitaj metodoj:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr ""
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr ""
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr ""
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "uzado: gpg [opcioj] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu �losilaro estas listigita �losilo"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de �losilservilo\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida �losilaro"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida �losilaro"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida �losilaro"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan �losilon al '%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [dosiero]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[dosiero]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/gpgv.c:72
+#: g10/gpgv.c:74
#, fuzzy
-msgid "take the keys from this keyring"
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "malkongruo de tempostampoj"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6487,77 +6489,77 @@ msgstr "enigata linio %u tro longa, a� mankas linifino\n"
msgid "can't open fd %d: %s\n"
msgstr "ne povas malfermi '%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "skribas sekretan �losilon al '%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "legeraro �e dosiero"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "pasfrazo estas tro longa\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "nevalida argumento"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "malkongruaj komandoj\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "nevalida kiraso"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "ne traktita"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "nevalida kiraso"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "ne traktita"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "nevalida kiraso"
@@ -6895,7 +6897,7 @@ msgstr "Donu la uzantidentigilon: "
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "legas opciojn el '%s'\n"
@@ -7529,186 +7531,146 @@ msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
msgid "no valid recipients given\n"
msgstr "nevalida respondo de agento\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[dosiero]|fari subskribon"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[dosiero]|fari klartekstan subskribon"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "listigi sekretajn �losilojn"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "Valida atestilrevoko"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "Bona atestilo"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "Bona atestilo"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "�an�i la pasfrazon"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "krei eligon en askia kiraso"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "tute ne uzi la terminalon"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "devigi v3-subskribojn"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "�iam uzi sigelon (MDC) por �ifrado"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "neinteraga re�imo: neniam demandi"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "supozi \"jes\" �e la plej multaj demandoj"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "supozi \"ne\" �e la plej multaj demandoj"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "aldoni �i tiun sekretan �losilaron al la listo"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMO|uzi �ifrad-metodon NOMO"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMO|uzi kompendi-metodon NOMO"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|uzi densig-metodon N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7719,60 +7681,60 @@ msgstr ""
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uzado: gpg [opcioj] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "ne povas konekti�i al '%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = supersalti �i tiun �losilon\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "ne povis analizi URI de �losilservilo\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "skribas al '%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8101,6 +8063,10 @@ msgstr "|N|uzi pasfraz-re�imon N"
msgid "do not allow the reuse of old passphrases"
msgstr "eraro dum kreado de pasfrazo: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8433,6 +8399,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[dosiero]|fari subskribon"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[dosiero]|fari subskribon"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[dosiero]|fari klartekstan subskribon"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "devigi v3-subskribojn"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "�iam uzi sigelon (MDC) por �ifrado"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "aldoni �i tiun sekretan �losilaron al la listo"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|uzi densig-metodon N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "forigi �losilojn de la publika �losilaro"
@@ -9041,10 +9042,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key uzantidentigilo"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "fari apartan subskribon"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "subskribi la �losilon nerevokeble"
diff --git a/po/es.po b/po/es.po
index 47678b237..2ff5a5e92 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2008-05-27 22:38+0100\n"
"Last-Translator: Jaime Su�rez <[email protected]>\n"
"Language-Team: Spanish <[email protected]>\n"
@@ -111,7 +111,7 @@ msgstr "Frase contrase�a"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -121,12 +121,12 @@ msgstr "no se puede crear %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no se puede abrir `%s': %s\n"
@@ -328,14 +328,14 @@ msgstr "ejecutar en modo servidor (primer plano)"
msgid "run in daemon mode (background)"
msgstr "ejecutar en modo demonio (segundo plano)"
-#: 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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "prolijo"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "algo m�s discreto"
@@ -347,7 +347,7 @@ msgstr "salida de datos estilo sh"
msgid "csh-style command output"
msgstr "salida de datos estilo csh"
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|FICHERO|lee opciones desde FICHERO"
@@ -412,7 +412,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr "|FICHERO|escribir variables de entorno tambi�n en FICHERO"
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Por favor, informe de posibles \"bugs\" a <"
@@ -429,30 +429,30 @@ msgstr ""
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
-#: agent/gpg-agent.c:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
@@ -1437,7 +1437,7 @@ msgstr "Orden inv�lida (pruebe \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "no se puede abrir `%s'\n"
@@ -1748,7 +1748,7 @@ msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
# S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
# puede acentuar? �demasiado alta?
# �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1756,35 +1756,37 @@ msgstr ""
"@�rdenes:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[file]|crea una firma"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[file]|crea una firma en texto claro"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "crea una firma separada"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "cifra datos"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "lista claves"
@@ -1796,11 +1798,11 @@ msgstr "lista claves y firmas"
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "lista claves secretas"
@@ -1808,79 +1810,80 @@ msgstr "lista claves secretas"
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo p�blico"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "elimina claves del anillo privado"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "firma la clave"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "firma la clave localmente"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exporta claves"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exporta claves a un servidor de claves"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importa claves desde un servidor de claves"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "busca claves en un servidor de claves"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "actualiza todas las claves desde un servidor de claves"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importa/fusiona claves"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "escribir estado de la tarjeta"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "cambiar datos en la tarjeta"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "cambiar el PIN de la tarjeta"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
-msgstr "|algo [ficheros]|imprime res�menes de mensaje"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
+msgstr "imprime todos los res�menes de mensaje"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr "ejecutar en modo servidor"
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1891,51 +1894,50 @@ msgstr ""
"Opciones:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOMBRE|cifra para NOMBRE"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa este usuario para firmar o descifrar"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivel de compresi�n N (0 no comprime)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
msgid "|FILE|write output to FILE"
msgstr "|FICHERO|volcar salida en FICHERO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "preguntar antes de sobreescribir"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "usar estilo OpenPGP estricto"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "generar mensajes compatibles con PGP 2.x"
-
# ordenes -> �rdenes
# p�gina man -> p�gina de manual
# Vale. �del manual mejor?
# Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1943,7 +1945,7 @@ msgstr ""
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1963,15 +1965,15 @@ msgstr ""
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1981,7 +1983,7 @@ msgstr ""
"firma, comprueba, cifra o descifra\n"
"la operaci�n por defecto depende de los datos de entrada\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1989,75 +1991,75 @@ msgstr ""
"\n"
"Algoritmos disponibles:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Clave p�blica: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Cifrado: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Resumen: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Compresi�n: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr "Bibliotecas utilizadas:"
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "�rdenes incompatibles\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2065,18 +2067,18 @@ msgstr ""
"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2084,438 +2086,438 @@ msgstr ""
"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "art�culo de configuraci�n desconocido `%s'\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr "mostrar foto IDs al listar claves"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr "mostrar URLS de pol�tica al listar firmas"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr "mostrar todas las notaciones al listar firmas"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr "mostrar notaciones est�ndar IETF al listar firmas"
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr "mostrar notaciones personalizadas al listar firmas"
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr "mostrar URL del servidor de claves preferido al listar firmas"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr "mostrar validez de la ID de usuario al listar claves"
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr "mostrar subclaves revocadas y expiradas al listar claves"
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "mostrar nombre de los anillos de claves al listar claves"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr "mostrar fechas de caducidad al listar firmas"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s no es para uso normal!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' no es una fecha de caducidad v�lida\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' no es un juego de caracteres v�lido\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inv�lidas\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "opciones de importaci�n inv�lidas\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inv�lida\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "lista de opciones inv�lida\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr "mostrar foto IDs al verificar firmas"
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr "mostrar URLs de pol�tica al verificar firmas"
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr "mostrar todas las notaciones al verificar firmas"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr "mostrar notaciones personalizadas al verificar firmas"
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr "mostrar validez del ID de usuario al verificar firmas"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
msgid "show only the primary user ID in signature verification"
msgstr "mostrar solo ID primario de usuario al verificar firmas"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr "validar firmas con datos PKA"
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "opciones de verificaci�n inv�lidas\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localizaci�n de claves inv�lida\n"
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "no se ejecutar� en memoria insegura por %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inv�lidas\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inv�lidas\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresi�n inv�lidas\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s a�n no funciona con %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "no puede usar el cifrado `%s' en modo %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "no puede usar el resumen `%s' en modo %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "no puede usar la compresi�n `%s' en modo %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nombre_fichero]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "no puede usar --symetric --encrypt en modo %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nombre_fichero]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [�rdenes]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "env�o al servidor de claves fallido: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepci�n del servidor de claves fallida: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "b�squeda del servidor de claves fallida: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovaci�n al servidor de claves fallida: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[nombre_fichero]"
@@ -2523,43 +2525,44 @@ msgstr "[nombre_fichero]"
# En espa�ol no se deja espacio antes de los puntos suspensivos
# (Real Academia dixit) :)
# Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "URL de pol�tica de certificado inv�lida\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "URL de pol�tica inv�lida\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido no es v�lida\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "tomar las claves de este anillo"
# o tal vez "en el sello..."
# Creo que es mejor "con el sello de fecha", no es un conflicto
# del sello en si mismo sino en relaci�n con el mensaje.
# Ok.
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6350,70 +6353,70 @@ msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
msgid "can't open fd %d: %s\n"
msgstr "no se puede abrir fd %d: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
msgid "argument not expected"
msgstr "par�metro inesperado"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
msgid "read error"
msgstr "error de lectura"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
msgid "keyword too long"
msgstr "palabra clave demasiado larga"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
msgid "missing argument"
msgstr "falta el par�metro"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
msgid "invalid command"
msgstr "orden inv�lida"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
msgid "invalid alias definition"
msgstr "definici�n de alias inv�lida"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "[Error - core]"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
msgid "invalid option"
msgstr "opci�n inv�lida"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr "falta par�metro para la opci�n \"%.50s\"\n"
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr "la opci�n \"%.50s\" no necesita par�metros\n"
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "orden inv�lida \"%.50s\"\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr "la opci�n \"%.50s\" es ambigua\n"
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr "la orden \"%.50s\" es ambigua\n"
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "[Error - core]"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "opci�n inv�lida \"%.50s\"\n"
@@ -6750,7 +6753,7 @@ msgstr "|N|Nuevo PIN"
msgid "run in multi server mode (foreground)"
msgstr "ejecutar en modo multi servidor (primer plano)"
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
msgid "read options from file"
msgstr "leyendo opciones desde fichero"
@@ -7338,119 +7341,95 @@ msgstr "borrado del certificado \"%s\" fallido: %s\n"
msgid "no valid recipients given\n"
msgstr "no se dieron receptores v�lidos\n"
-#: sm/gpgsm.c:248
-msgid "|[FILE]|make a signature"
-msgstr "|[FILE]|crea una firma"
-
-#: sm/gpgsm.c:249
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[FICHERO]|crea una firma en texto claro"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
msgid "list external keys"
msgstr "lista claves externas"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
msgid "list certificate chain"
msgstr "lista de cadenas de certificados"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
msgid "import certificates"
msgstr "importa certificado"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
msgid "export certificates"
msgstr "exporta certificado"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr "registrar tarjeta inteligente"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr "pasar una orden a dirmngr"
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr "invocar gpg-protect-tool"
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
msgid "change a passphrase"
msgstr "cambia una frase contrase�a"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
msgid "create base-64 encoded output"
msgstr "crea una salida en base-64"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr "asumir entrada en formato PEM"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr "asumir entrada en formato base-64"
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr "asumir entrada en formato binario"
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr "usar el dirmngr del sistema si est� disponible"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr "nunca consultar una CRL"
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr "comprabar validez usando OCSP"
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr "|N|n�mero de certificados que incluir"
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr "|FICHERO|tomar pol�tica de informaci�n de FICHERO"
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr "no comprobar pol�ticas de certificados"
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr "recuperar certificados de emisor perdidos"
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "usa la clave por defecto como destinatario"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "no usa la terminal en absoluto"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr "|FICHERO|escribir un log en modo servidor en FICHERO"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHERO|escribir inform de auditor�a a FICHERO"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "fuerza firmas v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "siempre usa un MDC para cifrar"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "proceso por lotes: nunca preguntar"
@@ -7460,60 +7439,46 @@ msgstr "proceso por lotes: nunca preguntar"
# Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
# viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
# preguntas no me acaba de gustar.
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "asume \"s�\" en casi todas las preguntas"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "asume \"no\" en casi todas las preguntas"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "a�ade este anillo a la lista de anillos"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "a�ade este anillo secreto a la lista"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SERVIDOR|usa este servidor de claves"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|usa el algoritmo de compresi�n N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpgsm [opciones] [ficheros] (-h para ayuda)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7523,59 +7488,59 @@ msgstr ""
"firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
"la operaci�n por defecto depende de los datos de entrada\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
msgid "usage: gpgsm [options] "
msgstr "uso: gpgsm [opciones] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "NOTA: no se podr� cifrar a `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, c-format
msgid "unknown validation model `%s'\n"
msgstr "modelo de validaci�n desconocido `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "l�nea %d: falta nombre de entidad\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = saltar esta clave\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "importando certificados comunes `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "no puedo firmar usando `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr "esta orden no est� a�n implementada\n"
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7904,6 +7869,10 @@ msgstr "|N|frase contrase�a caduca tras N d�as"
msgid "do not allow the reuse of old passphrases"
msgstr "no permite reusar antiguas frases contrase�a"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NOMBRE|cifra para el ususario NOMBRE tambi�n"
@@ -8236,6 +8205,42 @@ msgstr ""
"Compara frase contrase�a dada en entrada est�ndar con un fichero de "
"patrones\n"
+#~ msgid "|algo [files]|print message digests"
+#~ msgstr "|algo [ficheros]|imprime res�menes de mensaje"
+
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "generar mensajes compatibles con PGP 2.x"
+
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[FILE]|crea una firma"
+
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[FICHERO]|crea una firma en texto claro"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usa la clave por defecto como destinatario"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "fuerza firmas v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "siempre usa un MDC para cifrar"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "a�ade este anillo secreto a la lista"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usa el algoritmo de compresi�n N"
+
#~ msgid "remove key from the public keyring"
#~ msgstr "elimina clave del anillo p�blico"
@@ -9731,9 +9736,6 @@ msgstr ""
#~ msgid "tdbio_search_sdir failed: %s\n"
#~ msgstr "tdbio_search_dir fallida: %s\n"
-#~ msgid "print all message digests"
-#~ msgstr "imprime todos los res�menes de mensaje"
-
#~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
#~ msgstr ""
#~ "NOTA: el registro de firma %lu[%d] est� en la lista\n"
diff --git a/po/et.po b/po/et.po
index a8cf466a5..fc0dfd160 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <[email protected]>\n"
"Language-Team: Estonian <[email protected]>\n"
@@ -92,7 +92,7 @@ msgstr "halb parool"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "`%s' ei �nnestu luua: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
@@ -301,14 +301,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "ole jutukas"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ole m�nev�rra vaiksem"
@@ -320,7 +320,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
@@ -390,7 +390,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -407,30 +407,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
@@ -1451,7 +1451,7 @@ msgstr "Vigane k�sklus (proovige \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "v�ti --output ei t��ta selle k�suga\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' ei �nnestu avada\n"
@@ -1770,7 +1770,7 @@ msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1778,35 +1778,37 @@ msgstr ""
"@K�sud:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[fail]|loo allkiri"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "loo eraldiseisev allkiri"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "kr�pteeri andmed"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "kontrolli allkirja"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "n�ita v�tmeid"
@@ -1819,11 +1821,11 @@ msgstr "n�ita v�tmeid ja allkirju"
msgid "list and check key signatures"
msgstr "kontrolli v�tmete allkirju"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
@@ -1831,79 +1833,80 @@ msgstr "n�ita salajasi v�tmeid"
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "allkirjasta v�ti"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "ekspordi v�tmed"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "ekspordi v�tmed v�tmeserverisse"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "impordi v�tmed v�tmeserverist"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "otsi v�tmeid v�tmeserverist"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "uuenda v�tmeid v�tmeserverist"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1914,48 +1917,47 @@ msgstr ""
"V�tmed:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|kr�pti NIMEle"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "k�si enne �lekirjutamist"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1963,7 +1965,7 @@ msgstr ""
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1983,15 +1985,15 @@ msgstr ""
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2001,7 +2003,7 @@ msgstr ""
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2009,582 +2011,583 @@ msgstr ""
"\n"
"Toetatud algoritmid:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Avalik v�ti: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "�iffer: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "R�si: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Pakkimine: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "kasuta: gpg [v�tmed] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "tundmatu seade \"%s\"\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [failinimi]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[failinimi]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "v�ta v�tmed sellest v�tmehoidlast"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "teata ajatemplite konfliktist ainult hoiatusega"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6454,77 +6457,77 @@ msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
msgid "can't open fd %d: %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "viga faili lugemisel"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "rida on liiga pikk\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "vigane argument"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "vastuolulised k�sud\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "vigased impordi v�tmed\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "ei t��deldud"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "vigased impordi v�tmed\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "ei t��deldud"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "vigased impordi v�tmed\n"
@@ -6861,7 +6864,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "loen v�tmeid failist `%s'\n"
@@ -7481,186 +7484,146 @@ msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
msgid "no valid recipients given\n"
msgstr "(Kirjeldust ei antud)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[fail]|loo allkiri"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[fail]|loo avateksti allkiri"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "n�ita salajasi v�tmeid"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "halb sertifikaat"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "halb sertifikaat"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "halb sertifikaat"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "muuda parooli"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "loo ascii pakendis v�ljund"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NIMI|kasuta NIME vaikimisi saajana"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "�ra kasuta terminali"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "kasuta v3 allkirju"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "kr�ptimisel kasuta alati MDC"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "pakettmood: �ra k�si kunagi"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "eelda enamus k�simustele jah vastust"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "eelda enamus k�simustele ei vastust"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "lisa see salajaste v�tmete hoidla nimekirja"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|kasuta seda v�tmeserverit"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NIMI|terminali kooditabel on NIMI"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FAIL|lae laiendusmoodul FAIL"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|kasuta pakkimisalgoritmi N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7671,60 +7634,60 @@ msgstr ""
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "kasuta: gpg [v�tmed] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Kirjeldust ei antud)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " j = j�ta see v�ti vahele\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "kirjutan faili `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "`%s' ei �nnestu sulgeda: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8055,6 +8018,10 @@ msgstr "|N|kasuta parooli moodi N"
msgid "do not allow the reuse of old passphrases"
msgstr "viga parooli loomisel: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8388,6 +8355,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[fail]|loo allkiri"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[fail]|loo allkiri"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[fail]|loo avateksti allkiri"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "kasuta v3 allkirju"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "kr�ptimisel kasuta alati MDC"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "lisa see salajaste v�tmete hoidla nimekirja"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NIMI|terminali kooditabel on NIMI"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|kasuta pakkimisalgoritmi N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "eemalda v�tmed avalike v�tmete hoidlast"
@@ -9041,10 +9043,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key kasutaja-id"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "loo eraldiseisev allkiri"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "allkirjasta v�ti kehtetuks mitte-tunnistatavana"
diff --git a/po/fi.po b/po/fi.po
index bcc2b9cad..e0cc3b4a2 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <[email protected]>\n"
"Language-Team: Finnish <[email protected]>\n"
@@ -108,7 +108,7 @@ msgstr "väärä salasana"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -118,12 +118,12 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -317,14 +317,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "monisanainen"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
@@ -336,7 +336,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
@@ -406,7 +406,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -424,30 +424,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -1470,7 +1470,7 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -1789,7 +1789,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1797,35 +1797,37 @@ msgstr ""
"@Komennot:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[tiedosto]|tee allekirjoitus"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "tee erillinen allekirjoitus"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "salaa tiedot"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "näytä avaimet"
@@ -1838,11 +1840,11 @@ msgstr "näytä avaimet allekirjoituksineen"
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
@@ -1850,79 +1852,80 @@ msgstr "näytä salaiset avaimet"
msgid "generate a new key pair"
msgstr "luo uusi avainpari"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "poista avaimet salaisten avainten renkaasta"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "allekirjoita avain"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "allekirjoita avain paikallisesti"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "vie avaimia"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "vie avaimia palvelimelle"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "nouda avaimia avainpalvelimelta"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "etsi avaimia avainpalvelimelta"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "päivitä kaikki avaimet avainpalvelimelta"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "nouda/liitä avaimia"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "päivitä luottamustietokanta"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1933,48 +1936,47 @@ msgstr ""
"Valitsimet:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "älä tee muutoksia"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "kysy ennen ylikirjoittamista"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1983,7 +1985,7 @@ msgstr ""
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -2002,16 +2004,16 @@ msgstr ""
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2021,7 +2023,7 @@ msgstr ""
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2029,583 +2031,584 @@ msgstr ""
"\n"
"Tuetut algoritmit:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "JulkAvain: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Salaus: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Tiiviste: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Pakkaus: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "käyttö: gpg [valitsimet] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth tulee olla välillä 1-255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [tiedostonimi]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [tiedostonimi]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [tiedostonimi]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--allekirjoita [tiedostonimi]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [tiedostonimi]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key käyttäjätunnus"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key käyttäjätunnus"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key käyttäjätunnus [komennot]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[tiedostonimi]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "ota avaimet tästä avainrenkaasta"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6518,77 +6521,77 @@ msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
msgid "can't open fd %d: %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "virhe tiedostoa luettaessa"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "rivi on liian pitkä\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "virheellinen argumentti"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "ristiriitainen komento\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "virheelliset tuontivalitsimet\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "ei käsitelty"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "virheelliset tuontivalitsimet\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "ei käsitelty"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "virheelliset tuontivalitsimet\n"
@@ -6927,7 +6930,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -7547,186 +7550,146 @@ msgstr "avainlohkojen poisto epäonnistui: %s\n"
msgid "no valid recipients given\n"
msgstr "(Kuvausta ei annettu)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[tiedosto]|tee allekirjoitus"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "näytä salaiset avaimet"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "virheellinen varmenne"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "virheellinen varmenne"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "virheellinen varmenne"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "muuta salasanaa"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "tuota ascii-koodattu tuloste"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "käytä oletusavainta oletusvastaanottajana"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "älä käytä lainkaan päätettä"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "käytä aina v3-allekirjoituksia"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "käytä aina MDC:tä salaamiseen"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "eräajo: älä kysy mitään"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "lisää tämä salainen avainrengas luetteloon"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|käytä salausalgoritmia NIMI"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|käytä pakkausalgoritmia N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7737,60 +7700,60 @@ msgstr ""
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "käyttö: gpg [valitsimet] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Kuvausta ei annettu)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = ohita tämä avain\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8121,6 +8084,10 @@ msgstr "|N|käytä salasanoissa toimintatapaa N"
msgid "do not allow the reuse of old passphrases"
msgstr "virhe luotaessa salasanaa: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8454,6 +8421,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[tiedosto]|tee allekirjoitus"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[tiedosto]|tee allekirjoitus"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "käytä oletusavainta oletusvastaanottajana"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "käytä aina v3-allekirjoituksia"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "käytä aina MDC:tä salaamiseen"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "lisää tämä salainen avainrengas luetteloon"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|käytä pakkausalgoritmia N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "poista avaimet julkisten avainten renkaasta"
@@ -9125,10 +9127,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key käyttäjätunnus"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "tee erillinen allekirjoitus"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "allekirjoita avain mitätöimättömästi"
diff --git a/po/fr.po b/po/fr.po
index 518c55619..9e54b7677 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2008-09-30 19:38+0200\n"
"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
@@ -98,7 +98,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -108,12 +108,12 @@ msgstr "impossible de cr�er `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossible d'ouvrir `%s': %s\n"
@@ -313,14 +313,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "bavard"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
@@ -332,7 +332,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "lire les options de `%s'\n"
@@ -404,7 +404,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -423,30 +423,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
@@ -1452,7 +1452,7 @@ msgstr "Commande invalide (essayez �help�)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output n'est pas compatible avec cette commande\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "impossible d'ouvrir `%s'\n"
@@ -1778,7 +1778,7 @@ msgstr ""
msgid "key %s: secret key without public key - skipped\n"
msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1786,35 +1786,37 @@ msgstr ""
"@Commandes:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[fichier]|faire une signature"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "faire une signature d�tach�e"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "chiffrer les donn�es"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "chiffrement sym�trique seulement"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "d�chiffrer les donn�es (d�faut)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "v�rifier une signature"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "lister les cl�s"
@@ -1826,11 +1828,11 @@ msgstr "lister les cl�s et les signatures"
msgid "list and check key signatures"
msgstr "lister et v�rifier les signatures des cl�s"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "lister les cl�s et les empreintes"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "lister les cl�s secr�tes"
@@ -1838,79 +1840,80 @@ msgstr "lister les cl�s secr�tes"
msgid "generate a new key pair"
msgstr "g�n�rer une nouvelle paire de cl�s"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "enlever les cl�s du porte-cl�s public"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "enlever les cl�s du porte-cl�s secret"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "signer une cl�"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "signer une cl� localement"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "signer ou �diter une cl�"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "g�n�rer un certificat de r�vocation"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exporter les cl�s"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exporter les cl�s vers un serveur de cl�s"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importer les cl�s d'un serveur de cl�s"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "chercher les cl�s avec un serveur de cl�s"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "mettre � jour les cl�s depuis un serveur"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importer/fusionner les cl�s"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "afficher l'�tat de la carte"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "changer les donn�es d'une carte"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "changer le code PIN d'une carte"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "mettre la base de confiance � jour"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1921,48 +1924,47 @@ msgstr ""
"Options:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "cr�er une sortie ascii avec armure"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOM|chiffrer pour NOM"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "utiliser ce nom pour signer ou d�chiffrer"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|niveau de compression N (0 d�sactive)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "ne rien changer"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "demander avant d'�craser un fichier"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "utiliser strictement le comportement OpenPGP"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "g�n�rer des messages compatibles avec PGP 2.x"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1970,7 +1972,7 @@ msgstr ""
"@\n"
"(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1990,17 +1992,17 @@ msgstr ""
" --list-keys [utilisateur] montrer les cl�s\n"
" --fingerprint [utilisateur] montrer les empreintes\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Signaler toutes anomalies � <[email protected]> (en anglais)\n"
"et tout probl�me de traduction � <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2010,7 +2012,7 @@ msgstr ""
"signer, v�rifier, chiffrer ou d�chiffrer\n"
"l'op�ration par d�faut d�pend des donn�es entr�es\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2018,89 +2020,89 @@ msgstr ""
"\n"
"Algorithmes support�s:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Cl� publique: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Chiffrement: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hachage: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Compression: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "utilisation: gpg [options] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
"peu s�r\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
"est peu s�r\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
"s�r\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
"sont peu s�res\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du fichier de configuration\n"
"`%s' sont peu s�res\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
"peu s�res\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
"s�r pour le r�pertoire personnel `%s'\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2108,21 +2110,21 @@ msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
"s�r pour le fichier de configuration `%s'\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
"s�r pour l'extension `%s'\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
"r�pertoire personnel `%s' sont peu s�res\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2130,504 +2132,505 @@ msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
"fichier de configuration `%s' sont peu s�res\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant\n"
"l'extension `%s' sont peu s�res\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "�l�ment de configuration `%s' inconnu\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr ""
"passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
"et inversement"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' n'est pas un jeu de caract�res valide\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "les options du serveur de cl�s sont invalides\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: options d'import invalides\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "options d'import invalides\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: options d'export invalides\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "options d'export invalides\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: options de liste invalides\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "options de liste invalides\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: options de v�rification invalides\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "options de v�rification invalides\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: options de v�rification invalides\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENTION: %s remplace %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s !\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s !\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"il n'est possible de faire une signature d�tach�e ou en texte clair\n"
"qu'en mode --pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
"est activ�.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage s�lectionn�e est invalide\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression s�lectionn� est invalide\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "pr�f�rences par d�faut invalides\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "pr�f�rences de chiffrement personnelles invalides\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "pr�f�rences de hachage personnelles invalides\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "pr�f�rences de compression personnelles invalides\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne marche pas encore avec %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
"en mode %s.\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
"en mode %s.\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
"en mode %s.\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
"chiffrement ne se fait pas par cl� publique\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [nom du fichier]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [nom du fichier]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [nom du fichier]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nom du fichier]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [nom du fichier]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nom du fichier]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
"--s2k-mode 0\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
"en mode %s.\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom du fichier]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [nom du fichier]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [nom du fichier]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key utilisateur"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key utilisateur"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key utilisateur [commandes]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "l'export de la cl� a �chou�: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "la suppression d'une armure a �chou�: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "la construction d'une armure a �chou�: %s \n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage `%s' invalide\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[nom du fichier]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donn�e est invalide\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donn�e est invalide\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "enlever les cl�s de ce porte-cl�s"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr ""
"faire en sorte que les conflits d'horodatage ne soient qu'un\n"
"avertissement non fatal"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|�crire l'�tat sur ce descripteur"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6539,77 +6542,77 @@ msgstr ""
msgid "can't open fd %d: %s\n"
msgstr "impossible d'ouvrir `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "Les commandes d'administration ne sont pas permises\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "erreur de lecture"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "ligne trop longue"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "argument invalide"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "La commande n'est utilisable qu'en mode administration\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "options de liste invalides\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "non forc�"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "options de liste invalides\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Commande invalide (essayez �help�)\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "non forc�"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "options de liste invalides\n"
@@ -6954,7 +6957,7 @@ msgstr "|N|Nouveau code PIN"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "lire les options de `%s'\n"
@@ -7575,194 +7578,147 @@ msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
msgid "no valid recipients given\n"
msgstr "(Aucune description donn�e)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[fichier]|faire une signature"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[fichier]|faire une signature en texte clair"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "lister les cl�s secr�tes"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "mauvais certificat"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "mauvais certificat"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "mauvais certificat"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
#, fuzzy
msgid "register a smartcard"
msgstr "ajouter une cl� � une carte � puce"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "changer la phrase de passe"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "cr�er une sortie ascii avec armure"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr ""
-
-#: sm/gpgsm.c:329
-#, fuzzy
-msgid "use the default key as default recipient"
-msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "lire les options de `%s'\n"
-#: sm/gpgsm.c:351
-#, fuzzy
-msgid "force v3 signatures"
-msgstr "v�rifier les signatures"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr ""
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:361
+#: sm/gpgsm.c:297
#, fuzzy
-msgid "add this keyring to the list of keyrings"
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "enlever les cl�s de ce porte-cl�s"
-#: sm/gpgsm.c:362
-#, fuzzy
-msgid "add this secret keyring to the list"
-msgstr "Il faut la cl� secr�te pour faire cela.\n"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:365
-#, fuzzy
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOM|chiffrer pour NOM"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr ""
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "algorithme de chiffrement inconnu"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "signature %s, algorithme de hachage %s\n"
-#: sm/gpgsm.c:395
-#, fuzzy
-msgid "|N|use compress algorithm N"
-msgstr "algorithme de compression inconnu"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7773,60 +7729,60 @@ msgstr ""
"signer, v�rifier, chiffrer ou d�chiffrer\n"
"l'op�ration par d�faut d�pend des donn�es entr�es\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "utilisation: gpg [options] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "impossible de se connecter � `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "option `%s' inconnue\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Aucune description donn�e)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = sauter cette cl�\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossible d'acc�der � `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8163,6 +8119,10 @@ msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
msgid "do not allow the reuse of old passphrases"
msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8495,6 +8455,37 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "g�n�rer des messages compatibles avec PGP 2.x"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[fichier]|faire une signature"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[fichier]|faire une signature en texte clair"
+
+#, fuzzy
+#~ msgid "use the default key as default recipient"
+#~ msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
+
+#, fuzzy
+#~ msgid "force v3 signatures"
+#~ msgstr "v�rifier les signatures"
+
+#, fuzzy
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "Il faut la cl� secr�te pour faire cela.\n"
+
+#, fuzzy
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOM|chiffrer pour NOM"
+
+#, fuzzy
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "algorithme de compression inconnu"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "enlever les cl�s du porte-cl�s public"
diff --git a/po/gl.po b/po/gl.po
index a5d937f02..0e642f808 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <[email protected]>\n"
"Language-Team: Galician <[email protected]>\n"
@@ -92,7 +92,7 @@ msgstr "contrasinal err�neo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "non se pode crear `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
@@ -302,14 +302,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "lareto"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ser un pouqui�o m�is calado"
@@ -321,7 +321,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
@@ -393,7 +393,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -412,30 +412,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opci�ns `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo as opci�ns de `%s'\n"
@@ -1461,7 +1461,7 @@ msgstr "Comando incorrecto (tente \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "non se puido abrir `%s'\n"
@@ -1782,7 +1782,7 @@ msgstr "empr�gase 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 p�blica - omitida\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1790,35 +1790,37 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[ficheiro]|facer unha sinatura"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "facer unha sinatura separada"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "cifrar datos"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "cifrar s� con cifrado sim�trico"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verificar unha sinatura"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "ve-la lista de chaves"
@@ -1831,11 +1833,11 @@ msgstr "ve-la lista de chaves e sinaturas"
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
@@ -1843,79 +1845,80 @@ msgstr "ve-la lista de chaves secretas"
msgid "generate a new key pair"
msgstr "xerar un novo par de chaves"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro p�blico"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "borrar chaves do chaveiro secreto"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "asinar unha chave"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "asinar unha chave localmente"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocaci�n"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exportar chaves a un servidor de chaves"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importar chaves dun servidor de chaves"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "buscar chaves nun servidor de chaves"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "actualizar t�dalas chaves dun servidor de chaves"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importar/mesturar chaves"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "actualiza-la base de datos de confianza"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1926,48 +1929,47 @@ msgstr ""
"Opci�ns:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "crear sa�da con armadura en ascii"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "non facer ning�n cambio"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "avisar antes de sobrescribir"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1975,7 +1977,7 @@ msgstr ""
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1995,17 +1997,17 @@ msgstr ""
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Por favor, informe dos erros no programa a <[email protected]>,\n"
"e dos erros na traducci�n a <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2015,7 +2017,7 @@ msgstr ""
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2023,585 +2025,586 @@ msgstr ""
"\n"
"Algoritmos soportados:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "P�blica: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Cifra: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Compresi�n: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "uso: gpg [opci�ns] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "amosar en que chaveiro est� unha chave listada"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s non � para uso normal!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s non se admite con %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
"activado.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe valer entre 1 e 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non v�lidas\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non v�lidas\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non v�lidas\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresi�n personais non v�lidas\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�%s a�nda non traballa con %s!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [ficheiro]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [ficheiro]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [ficheiro]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [ficheiro]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [ficheiro]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key id-de-usuario"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key id-de-usuario"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-de-usuario [comandos]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[ficheiro]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a s�a mensaxe ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "toma-las chaves deste chaveiro"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "converte-los conflictos de selo de data nun aviso"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|DF|escribi-la informaci�n de estado a este DF"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6526,77 +6529,77 @@ msgstr ""
msgid "can't open fd %d: %s\n"
msgstr "non se puido abrir `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "gravando a chave secreta en `%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "erro de lectura de ficheiro"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "li�a longa de m�is\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "argumento non v�lido"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "comandos conflictivos\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "opci�ns de importaci�n non v�lidas\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "non procesado"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "opci�ns de importaci�n non v�lidas\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Comando incorrecto (tente \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "non procesado"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
@@ -6936,7 +6939,7 @@ msgstr "Introduza o ID de usuario: "
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "lendo as opci�ns de `%s'\n"
@@ -7569,186 +7572,146 @@ msgstr "fallou o borrado do bloque de chaves: %s\n"
msgid "no valid recipients given\n"
msgstr "(Non se deu unha descrici�n)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[ficheiro]|facer unha sinatura"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[ficheiro]|facer unha sinatura en texto claro"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "ve-la lista de chaves secretas"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "Revocaci�n de certificado v�lida"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "Certificado correcto"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "Certificado correcto"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "cambia-lo contrasinal"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crear sa�da con armadura en ascii"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "usa-la chave por defecto coma o destinatario por defecto"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "non usa-la terminal en absoluto"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "forzar sinaturas v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "sempre usar un MDC para cifrar"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "modo por lotes: non preguntar nunca"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "asumir `si' na maior�a das preguntas"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "asumir `non' na maior�a das preguntas"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "engadir este chaveiro � lista de chaveiros"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "engadir este chaveiro secreto � lista"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|empregar NOME coma chave secreta por defecto"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|emprega-lo algoritmo de compresi�n N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7759,60 +7722,60 @@ msgstr ""
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uso: gpg [opci�ns] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "non se puido conectar a `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Non se deu unha descrici�n)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " o = omitir esta chave\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "escribindo a `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8144,6 +8107,10 @@ msgstr "|N|emprega-lo modo de contrasinal N"
msgid "do not allow the reuse of old passphrases"
msgstr "erro ao crea-lo contrasinal: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|empregar NOME coma chave secreta por defecto"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8479,6 +8446,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[ficheiro]|facer unha sinatura"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[ficheiro]|facer unha sinatura"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[ficheiro]|facer unha sinatura en texto claro"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usa-la chave por defecto coma o destinatario por defecto"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "forzar sinaturas v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "sempre usar un MDC para cifrar"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "engadir este chaveiro secreto � lista"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|emprega-lo algoritmo de compresi�n N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "borrar chaves do chaveiro p�blico"
@@ -9155,10 +9157,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key id-de-usuario"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "facer unha sinatura separada"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "asina-la chave de xeito non revocable"
diff --git a/po/hu.po b/po/hu.po
index 64a662601..bd3272d7d 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
"Language-Team: Hungarian <[email protected]>\n"
@@ -92,7 +92,7 @@ msgstr "rossz jelsz�"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -301,14 +301,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "b�besz�d� m�d"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "m�g sz�kszav�bb m�d"
@@ -320,7 +320,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
@@ -390,7 +390,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -407,30 +407,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "\"%s\" opci�s f�jl: %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
@@ -1451,7 +1451,7 @@ msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
msgid "--output doesn't work for this command\n"
msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
@@ -1767,7 +1767,7 @@ msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1775,35 +1775,37 @@ msgstr ""
"@Parancsok:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[f�jl]|al��r�s k�sz�t�se"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "k�l�n�ll� al��r�s k�sz�t�se"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "adat titkos�t�sa"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "adat visszafejt�se (alap�rtelmez�s)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "al��r�s ellen�rz�se"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "kulcsok list�z�sa"
@@ -1816,11 +1818,11 @@ msgstr "kulcsok �s al��r�sok list�z�sa"
msgid "list and check key signatures"
msgstr "kulcsal��r�sok ellen�rz�se"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "kulcsok �s ujjlenyomatok list�z�sa"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "titkos kulcsok list�z�sa"
@@ -1828,79 +1830,80 @@ msgstr "titkos kulcsok list�z�sa"
msgid "generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "kulcs al��r�sa"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "kulcs al��r�sa helyileg"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "kulcs al��r�sa vagy szerkeszt�se"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "visszavon�si igazol�s k�sz�t�se"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "kulcsok export�l�sa"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "kulcsok export�l�sa kulcsszerverre"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "kulcsok import�l�sa kulcsszerverr�l"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "kulcsok keres�se kulcsszerveren"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "minden kulcs friss�t�se kulcsszerverr�l"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "kulcsok import�l�sa/�sszef�z�se"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "bizalmi adatb�zis friss�t�se"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1911,48 +1914,47 @@ msgstr ""
"Opci�k:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|N�V|titkos�t�s N�V r�sz�re"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "kanonikus sz�veges m�d haszn�lata"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "ne csin�ljon semmi v�ltoztat�st"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "fel�l�r�s el�tt r�k�rdez�s"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1960,7 +1962,7 @@ msgstr ""
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1980,15 +1982,15 @@ msgstr ""
" --list-keys [nevek] kulcsok ki�rat�sa\n"
" --fingerprint [nevek] ujjlenyomatok ki�rat�sa\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1998,7 +2000,7 @@ msgstr ""
"Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
"Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2006,583 +2008,584 @@ msgstr ""
"\n"
"T�mogatott algoritmusok:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Nyilv�nos kulcs� (pubkey): "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Rejtjelez� (cipher): "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Kivonatol� (hash): "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "T�m�r�t� (compression): "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "Haszn�lat: gpg [opci�k] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "�rv�nytelen import opci�k!\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "�rv�nytelen import opci�k!\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �rtelmetlen %s mellett!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [f�jln�v]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [f�jln�v]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [f�jln�v]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [f�jln�v]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [f�jln�v]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [f�jln�v]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [f�jln�v]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key felh-azonos�t�"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key felh-azonos�t�"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key felh-azonos�t� [parancsok]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[f�jln�v]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti g�pelni az �zenetet...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6486,77 +6489,77 @@ msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
msgid "can't open fd %d: %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "�llom�nyolvas�si hiba"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "A sor t�l hossz�!\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "�rv�nytelen argumentum"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "Egym�snak ellentmond� parancsok!\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "�rv�nytelen import opci�k!\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "nem feldolgozott"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "�rv�nytelen import opci�k!\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "nem feldolgozott"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "�rv�nytelen import opci�k!\n"
@@ -6893,7 +6896,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
@@ -7514,186 +7517,146 @@ msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
msgid "no valid recipients given\n"
msgstr "(Nincs le�r�s.)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[f�jl]|al��r�s k�sz�t�se"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "titkos kulcsok list�z�sa"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "rossz igazol�s"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "rossz igazol�s"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "rossz igazol�s"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "jelsz�v�ltoztat�s"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "ne haszn�lja a termin�lt egy�ltal�n"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "3-as verzi�j� al��r�sok er�ltet�se"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "k�tegelt m�d: soha nem k�rdez"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|f�jl|b�v�t� modul bet�lt�se"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7704,60 +7667,60 @@ msgstr ""
"Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
"Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "Haszn�lat: gpg [opci�k] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Nincs le�r�s.)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " h = kulcs kihagy�sa\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "�rok a \"%s\" �llom�nyba.\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8088,6 +8051,10 @@ msgstr "|N|N. sorsz�m� jelsz�m�d haszn�lata"
msgid "do not allow the reuse of old passphrases"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8421,6 +8388,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[f�jl]|al��r�s k�sz�t�se"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[f�jl]|al��r�s k�sz�t�se"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "3-as verzi�j� al��r�sok er�ltet�se"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|f�jl|b�v�t� modul bet�lt�se"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
@@ -9090,10 +9092,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key felh-azonos�t�"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "k�l�n�ll� al��r�s k�sz�t�se"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "kulcs nem visszavonhat� al��r�sa"
diff --git a/po/id.po b/po/id.po
index ccdedb283..8b4161f35 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <[email protected]>\n"
"Language-Team: Indonesian <[email protected]>\n"
@@ -94,7 +94,7 @@ msgstr "passphrase yang buruk"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -104,12 +104,12 @@ msgstr "tidak dapat membuat %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@ -303,14 +303,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detil"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "lebih diam"
@@ -322,7 +322,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|muat modul ekstensi FILE"
@@ -392,7 +392,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -409,30 +409,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
@@ -1454,7 +1454,7 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "tidak dapat membuka `%s'\n"
@@ -1769,7 +1769,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1777,35 +1777,37 @@ msgstr ""
"@Perintah:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[file]|buat signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "buat detached signature"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[file]|buat signature teks"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "buat detached signature"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "enkripsi data"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verifikasi signature"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "tampilkan kunci"
@@ -1818,11 +1820,11 @@ msgstr "tampilkan kunci dan signature"
msgid "list and check key signatures"
msgstr "periksa signature kunci"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
@@ -1830,79 +1832,80 @@ msgstr "tampilkan kunci rahasia"
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "tandai kunci"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "ekspor kunci"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "ekspor kunci ke key server"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "impor kunci dari key server"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "cari kunci di key server"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "impor/gabung kunci"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "perbarui database trust"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [file]|cetak digest pesan"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1913,48 +1916,47 @@ msgstr ""
"Pilihan:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAMA|enkripsi untuk NAMA"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "jangan buat perubahan"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "tanya sebelum menimpa"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1962,7 +1964,7 @@ msgstr ""
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1982,15 +1984,15 @@ msgstr ""
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Laporkan bug ke <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2000,7 +2002,7 @@ msgstr ""
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2008,591 +2010,592 @@ msgstr ""
"\n"
"Algoritma yang didukung:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Kompresi: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"anda hanya dapat membuat signature detached atau clear saat dalam mode --"
"pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
"pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
"pgpg2\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth harus di antara 1 hingga 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
"key \n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [namafile]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [namafile]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[namafile]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "mengambil kunci ini dari keyring"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "buat timestamp konflik hanya sebagai peringatan"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6480,77 +6483,77 @@ msgstr "baris input %u terlalu panjang atau hilang LF\n"
msgid "can't open fd %d: %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "kesalahan baca file"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "baris terlalu panjang\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "argumen tidak valid"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "perintah saling konflik\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "opsi impor tidak valid\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "tidak diproses"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "opsi impor tidak valid\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "tidak diproses"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "opsi impor tidak valid\n"
@@ -6887,7 +6890,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "membaca pilihan dari `%s'\n"
@@ -7508,186 +7511,146 @@ msgstr "gagal menghapus keyblok: %s\n"
msgid "no valid recipients given\n"
msgstr "(Tidak diberikan deskripsi)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[file]|buat signature"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[file]|buat signature teks"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "tampilkan kunci rahasia"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "sertifikat yang buruk"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "sertifikat yang buruk"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "sertifikat yang buruk"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "ubah passphrase"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ciptakan output ascii"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "gunakan kunci baku sebagai penerima baku"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "jangan menggunakan terminal"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "paksa signature v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "selalu gunakan MDC untuk enkripsi"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "mode batch: tanpa tanya"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "asumsikan ya untuk seluruh pertanyaan"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "asumsikan tidak untuk seluruh pertanyaan"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "tambah keyring ini ke daftar keyring"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "tambah keyring rahasia ini ke daftar"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAMA|set charset terminal ke NAMA"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FILE|muat modul ekstensi FILE"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMA|gunakan algoritma cipher NAMA"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|gunakan algoritma kompresi N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7698,60 +7661,60 @@ msgstr ""
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Tidak diberikan deskripsi)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = lewati kunci ini\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "tidak dapat memparsing URI keyserver\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "menulis ke `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8082,6 +8045,10 @@ msgstr "|N|gunakan passphrase mode N"
msgid "do not allow the reuse of old passphrases"
msgstr "kesalahan penciptaan passphrase: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8415,6 +8382,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[file]|buat signature"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[file]|buat signature"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[file]|buat signature teks"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "gunakan kunci baku sebagai penerima baku"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "paksa signature v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "selalu gunakan MDC untuk enkripsi"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "tambah keyring rahasia ini ke daftar"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAMA|set charset terminal ke NAMA"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FILE|muat modul ekstensi FILE"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|gunakan algoritma kompresi N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "hapus kunci dari keyring publik"
@@ -9087,10 +9089,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key user-id"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "buat detached signature"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "tandai kunci sebagai tidak dapat dibatalkan"
diff --git a/po/it.po b/po/it.po
index 28923db7b..1b5842ad3 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2008-05-26 12:02+0200\n"
"Last-Translator: Marco d'Itri <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -92,7 +92,7 @@ msgstr "passphrase errata"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritmo di protezione %d%s non � gestito\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "impossibile creare `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
@@ -301,14 +301,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "prolisso"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "meno prolisso"
@@ -320,7 +320,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
@@ -390,7 +390,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -407,30 +407,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
@@ -1453,7 +1453,7 @@ msgstr "Comando non valido (prova \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "impossibile aprire `%s'\n"
@@ -1778,7 +1778,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1786,35 +1786,37 @@ msgstr ""
"@Comandi:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[file]|fai una firma"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "fai una firma separata"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "fai una firma separata"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "cifra dati"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "elenca le chiavi"
@@ -1827,11 +1829,11 @@ msgstr "elenca le chiavi e le firme"
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
@@ -1839,79 +1841,80 @@ msgstr "elenca le chiavi segrete"
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "rimuove le chiavi dal portachiavi privato"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "firma una chiave"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "firma una chiave localmente"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "esporta delle chiavi"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "esporta le chiavi a un key server"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importa le chiavi da un key server"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "cerca delle chiavi su un key server"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "aggiorna tutte le chiavi da un key server"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1922,48 +1925,47 @@ msgstr ""
"Opzioni:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifra per NOME"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "non fa cambiamenti"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "chiede prima di sovrascrivere"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1971,7 +1973,7 @@ msgstr ""
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1991,15 +1993,15 @@ msgstr ""
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Per favore segnala i bug a <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2009,7 +2011,7 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2017,586 +2019,587 @@ msgstr ""
"\n"
"Algoritmi gestiti:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "A chiave pubblica: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Cifrari: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Compressione: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "uso: gpg [opzioni] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr ""
"NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s normalmente non deve essere usato!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve essere tra 1 e 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
"crittografia a chiave pubblica\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [nomefile]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "decifratura fallita: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nomefile]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[nomefile]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non � valido\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "prende le chiavi da questo portachiavi"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "segnala i conflitti di data solo con un avvertimento"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato sul FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6524,79 +6527,79 @@ msgstr "linea di input %u troppo lunga o LF mancante\n"
msgid "can't open fd %d: %s\n"
msgstr "impossibile aprire `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "errore durante la lettura del file"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "riga troppo lunga\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "argomento non valido"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "comandi in conflitto\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "opzioni di importazione non valide\n"
# ??? (Md)
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "non esaminato"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "opzioni di importazione non valide\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Comando non valido (prova \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
# ??? (Md)
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "non esaminato"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "opzioni di importazione non valide\n"
@@ -6933,7 +6936,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "lettura delle opzioni da `%s'\n"
@@ -7553,186 +7556,146 @@ msgstr "cancellazione del keyblock fallita: %s\n"
msgid "no valid recipients given\n"
msgstr "(Non � stata data una descrizione)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[file]|fai una firma"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "elenca le chiavi segrete"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "certificato danneggiato"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "certificato danneggiato"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "certificato danneggiato"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la passphrase"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "crea un output ascii con armatura"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|usa NOME come destinatario predefinito"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "usa la chiave predefinita come destinatario predefinito"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "non usa per niente il terminale"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "forza l'uso di firme v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "usa sempre un MDC per cifrare"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "modo batch: non fa domande"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "risponde \"s�\" a quasi tutte le domande"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "risponde \"no\" a quasi tutte le domande"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "aggiungi questo portachiavi alla lista"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "aggiungi questo portachiavi segreto alla lista"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOME|imposta NOME come set di caratteri del terminale"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FILE|carica il modulo di estensione FILE"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usa l'algoritmo di cifratura NOME"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usa l'algoritmo di message digest NOME"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|usa l'algoritmo di compressione N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7743,60 +7706,60 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uso: gpg [opzioni] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "impossibile connettersi a `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Non � stata data una descrizione)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = salta questa chiave\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "scrittura in `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8127,6 +8090,10 @@ msgstr "|N|usa il modo N per la passphrase"
msgid "do not allow the reuse of old passphrases"
msgstr "errore nella creazione della passhprase: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|usa NOME come chiave segreta predefinita"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8460,6 +8427,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[file]|fai una firma"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[file]|fai una firma"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOME|usa NOME come destinatario predefinito"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usa la chiave predefinita come destinatario predefinito"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "forza l'uso di firme v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "usa sempre un MDC per cifrare"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "aggiungi questo portachiavi segreto alla lista"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOME|imposta NOME come set di caratteri del terminale"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FILE|carica il modulo di estensione FILE"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usa l'algoritmo di compressione N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "rimuove le chiavi dal portachiavi pubblico"
@@ -9148,10 +9150,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key user-id"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "fai una firma separata"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "firma la chiave irrevocabilmente"
diff --git a/po/ja.po b/po/ja.po
index 7e8b9b29f..a52a7b41e 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2004-11-23 11:14+0900\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -96,7 +96,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -106,12 +106,12 @@ msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "��%s�פ������ޤ���: %s\n"
@@ -305,14 +305,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "��Ĺ"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "����Ť�"
@@ -324,7 +324,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -394,7 +394,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -411,30 +411,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "���ץ���󡦥ե������%s��: %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -1427,7 +1427,7 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
msgid "--output doesn't work for this command\n"
msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "��%s�פ������ޤ���\n"
@@ -1729,7 +1729,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1737,35 +1737,37 @@ msgstr ""
"@���ޥ��:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[�ե�����]|��̾�����"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "���ѽ�̾�����"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[�ե�����]|���ꥢ��̾�����"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "ʬΥ��̾�����"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "�ǡ�����Ź沽"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "�ǡ��������� (����)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "��̾�򸡾�"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "�����"
@@ -1777,11 +1779,11 @@ msgstr "���Ƚ�̾�ΰ���"
msgid "list and check key signatures"
msgstr "����̾�θ����Ȱ���"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "���Ȼ���ΰ���"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "��̩���ΰ���"
@@ -1789,79 +1791,80 @@ msgstr "��̩���ΰ���"
msgid "generate a new key pair"
msgstr "��������������"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "�������ؤ��鸰������"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "��̩���ؤ��鸰������"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "���˽�̾"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "��������Ū�˽�̾"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "���ؤν�̾���Խ�"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "���������������"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "����񤭽Ф�"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "�������С��˸���񤭽Ф�"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "�������С��θ��򸡺�����"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "�������С����鸰��������������"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "�����ɹ���/ʻ��"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "�����ɾ��֤�ɽ��"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "�����ɤΥǡ������ѹ�"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "�����ɤ�PIN���ѹ�"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1872,52 +1875,51 @@ msgstr ""
"���ץ����:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "ASCII���������������"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"��̾������ˤ��Υ桼����id\n"
"�����"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|���̥�٥��N������\n"
"(0���󰵽�)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "����ƥ����ȡ��⡼�ɤ����"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "̵�ѹ�"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "������˳�ǧ"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "��̩��OpenPGP�ο�������"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "PGP 2.x�ߴ��Υ�å�����������"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1926,7 +1928,7 @@ msgstr ""
"(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
"�ޥ˥奢�롦�ڡ���������������)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1946,15 +1948,15 @@ msgstr ""
" --list-keys [̾��] ����ɽ��\n"
" --fingerprint [̾��] �����ɽ��\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1964,7 +1966,7 @@ msgstr ""
"��̾���������Ź沽������\n"
"��������ϡ����ϥǡ����˰�¸\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1972,573 +1974,574 @@ msgstr ""
"\n"
"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "������: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "�Ź�ˡ: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "�ϥå���: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "����: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "�Ȥ���: gpg [���ץ����] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "��Ω���륳�ޥ��\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "̤�Τι������ܡ�%s��\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "��̩���ȸ������ΰ�����ȿž"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "����: ����%s�ϻȤ��ޤ���!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "�������С���URL�������ǽ\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "̵���ʸ������С������ץ����Ǥ�\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "̵���ʰ������ץ����Ǥ�\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path��%s��������ǽ\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�ٹ�: %s��%s���ͥ��\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "̵���ʴ��������\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "̵���ʸĿ������������\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "̵���ʸĿ��Ѱ��̤�����\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [�ե�����̾]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [�ե�����̾]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [�ե�����̾]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [�ե�����̾]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [�ե�����̾]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [�ե�����̾]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [�ե�����̾]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [�ե�����̾]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key �桼����id"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key �桼����id"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �桼����id [���ޥ��]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "��������˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[�ե�����̾]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "���θ����ؤ��������ޤ�"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "������̷���ٹ�����ˤ��ޤ�"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr ""
"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
"�񤭹���"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6303,77 +6306,77 @@ msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
msgid "can't open fd %d: %s\n"
msgstr "��%s�פ������ޤ���: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "�ե�������ɽФ����顼"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "�Ԥ�Ĺ�����ޤ�"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "̵���ʻ���Ǥ�"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "�������ѥ��ޥ��\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "̵���ʰ������ץ����Ǥ�\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "̤����"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "̵���ʰ������ץ����Ǥ�\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "̤����"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "̵���ʰ������ץ����Ǥ�\n"
@@ -6708,7 +6711,7 @@ msgstr "������PIN"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -7328,194 +7331,147 @@ msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
msgid "no valid recipients given\n"
msgstr "(�����Ϥ���ޤ���)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[�ե�����]|��̾�����"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[�ե�����]|���ꥢ��̾�����"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "��̩���ΰ���"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "�����ʾ�����Ǥ�"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "�����ʾ�����Ǥ�"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "�����ʾ�����Ǥ�"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
#, fuzzy
msgid "register a smartcard"
msgstr "���ޡ��ȥ����ɤظ����ɲ�"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "�ѥ��ե졼�����ѹ�"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "ASCII���������������"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr ""
-
-#: sm/gpgsm.c:329
-#, fuzzy
-msgid "use the default key as default recipient"
-msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
-#: sm/gpgsm.c:351
-#, fuzzy
-msgid "force v3 signatures"
-msgstr "��̾�μ���"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr ""
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:361
+#: sm/gpgsm.c:297
#, fuzzy
-msgid "add this keyring to the list of keyrings"
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "���θ����ؤ��������ޤ�"
-#: sm/gpgsm.c:362
-#, fuzzy
-msgid "add this secret keyring to the list"
-msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:365
-#, fuzzy
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr ""
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
-#: sm/gpgsm.c:395
-#, fuzzy
-msgid "|N|use compress algorithm N"
-msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7526,60 +7482,60 @@ msgstr ""
"��̾���������Ź沽������\n"
"��������ϡ����ϥǡ����˰�¸\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "�Ȥ���: gpg [���ץ����] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "̤�ΤΥ��ץ�����%s��\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(�����Ϥ���ޤ���)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = ���θ��ϤȤФ�\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "�������С���URL�������ǽ\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7908,6 +7864,10 @@ msgstr "�������"
msgid "do not allow the reuse of old passphrases"
msgstr "�ѥ��ե졼���κ������顼: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8240,6 +8200,40 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[�ե�����]|��̾�����"
+
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "PGP 2.x�ߴ��Υ�å�����������"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[�ե�����]|��̾�����"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[�ե�����]|���ꥢ��̾�����"
+
+#, fuzzy
+#~ msgid "use the default key as default recipient"
+#~ msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
+
+#, fuzzy
+#~ msgid "force v3 signatures"
+#~ msgstr "��̾�μ���"
+
+#, fuzzy
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
+
+#, fuzzy
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|̾��|��̾�����Ѥ˰Ź沽"
+
+#, fuzzy
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "�������ؤ��鸰������"
@@ -8921,9 +8915,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key �桼����id"
-#~ msgid "make a trust signature"
-#~ msgstr "���ѽ�̾�����"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "�����Ǥ��ʤ��褦���ؽ�̾"
diff --git a/po/nb.po b/po/nb.po
index 3f0e7fa28..1ce317c09 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2006-06-13 20:31+0200\n"
"Last-Translator: Trond Endrest�l <[email protected]>\n"
"Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -96,7 +96,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -106,12 +106,12 @@ msgstr "kan ikke opprette �%s�: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke �pne �%s�: %s\n"
@@ -305,14 +305,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "fyldig output"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "v�re noenlunde stille"
@@ -324,7 +324,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "leser valg fra �%s�\n"
@@ -394,7 +394,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -411,30 +411,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MERK: ingen standard valgfil �%s�\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "valgfil �%s�: %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "leser valg fra �%s�\n"
@@ -1414,7 +1414,7 @@ msgstr "Ugyldig kommando (pr�v �help�)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommandoen\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "kan ikke �pne �%s�\n"
@@ -1722,7 +1722,7 @@ msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1730,35 +1730,37 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[fil]|lage en signatur"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[fil]|lage en klartekstsignatur"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "lage en adskilt signatur"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "kryptere data"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "kryptering med bare symmetrisk cipher"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "dekryptere data (standard)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "bekrefte en signatur"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "liste n�kler"
@@ -1770,11 +1772,11 @@ msgstr "liste n�kler og signaturer"
msgid "list and check key signatures"
msgstr "vise og sjekke n�kkelsignaturer"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "liste n�kler og fingeravtrykk"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "liste hemmelige n�kler"
@@ -1782,79 +1784,80 @@ msgstr "liste hemmelige n�kler"
msgid "generate a new key pair"
msgstr "generere et nytt n�kkelpar"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "signere en n�kkel"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "signere en n�kkel lokalt"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "signere eller redigere en n�kkel"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "generere et opphevingssertifikat"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "eksportere n�kler"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "eksportere n�kler til en n�kkelserver"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importere n�kler fra en n�kkelserver"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "s�ke etter n�kler p� en n�kkelserver"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "oppdatere alle n�klene fra en n�kkelserver"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importere/flette n�kler"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "vis kortets status"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "endre data p� et kort"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "endre PIN p� et kort"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "oppdatere tillitsdatabasen"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [filer]|skrive meldingsdigester"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1865,48 +1868,47 @@ msgstr ""
"Valg:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "lage ASCII-beskyttet output"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAVN|kryptere for NAVN"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "bruke denne brukeriden for signering eller dekryptering"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "ikke gj�r noen endringer"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "sp�r f�r overskriving"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "bruk streng OpenPGP-oppf�rsel"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "generere PGP 2.x-kompatible meldinger"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1914,7 +1916,7 @@ msgstr ""
"@\n"
"(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1934,15 +1936,15 @@ msgstr ""
" --list-keys [navn] vise n�kler\n"
" --fingerprint [navn] vise fingeravtrykk\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Vennligst rapporter feil til <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1952,7 +1954,7 @@ msgstr ""
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1960,76 +1962,76 @@ msgstr ""
"\n"
"St�ttede algoritmer:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Offentlig n�kkel: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Kompresjon: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "bruksm�te: gpg [valg] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%s�\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2037,20 +2039,20 @@ msgstr ""
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen �%"
"s�\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen �%"
"s�\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2058,476 +2060,477 @@ msgstr ""
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
"konfigurasjonsfilen �%s�\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "ukjent konfigurasjonspunkt �%s�\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr ""
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "vise navnet til n�kkelknippene i n�kkellister"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr ""
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "MERK: %s er ikke for vanlig bruk!\n"
# Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "�%s� er ikke en gyldig signaturutg�else\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "�%s� er ikke et gyldig tegnsett\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke parse n�kkelserverens URL\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "ugyldige valg for n�kkelserver\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importvalg\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "ugyldige importvalg\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportvalg\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "ugyldige eksportvalg\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr ""
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr ""
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
msgid "show only the primary user ID in signature verification"
msgstr ""
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige valg for bekreftelse\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "ugyldige valg for bekreftelse\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke sette exec-path til %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er ikke fornuftig med %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr ""
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "valg digestalgoritme er ugyldig\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "valgt kompresjonsalgoritme er ugyldig\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m� v�re st�rre enn 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neede m� v�re st�rre enn 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "ugyldig standard preferanser\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "ugyldig personlig cipherpreferanser\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "ugyldig personlig digestpreferanser\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "ugyldig personlig kompresjonspreferanser\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enn� med %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [filnavn]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key brukerid"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key brukerid"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key brukerid [kommandoer]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sending til n�kkelserver mislyktes: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "mottak fra n�kkelserver mislyktes: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "n�kkeleksport mislyktes: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "s�k p� n�kkelserver mislyktes: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh p� n�kkelserver mislyktes: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hashalgoritme �%s�\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[filnavn]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Sett i gang og tast inn meldingen din ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "hent n�klene fra dette n�kkelknippet"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|skrive statusinfo til denne FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6240,77 +6243,77 @@ msgstr ""
msgid "can't open fd %d: %s\n"
msgstr "kan ikke �pne �%s�: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "Admin-kommandoer er ikke tillatt\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "feil ved lesing av fil"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "for lang linje"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "ugydig argument"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "Admin-reservert kommando\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "ugyldige listevalg\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "ikke tvunget"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "ugyldige listevalg\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Ugyldig kommando (pr�v �help�)\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "ikke tvunget"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "ugyldige listevalg\n"
@@ -6643,7 +6646,7 @@ msgstr "|N|Ny PIN"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "leser valg fra �%s�\n"
@@ -7260,193 +7263,146 @@ msgstr "sleting av n�kkelblokk mislyktes: %s\n"
msgid "no valid recipients given\n"
msgstr "ingen gyldige adressater\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[fil]|lage en signatur"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[fil]|lage en klartekstsignatur"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "liste hemmelige n�kler"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "ugyldig sertifikat"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "ugyldig sertifikat"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "ugyldig sertifikat"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "endre passfrasen"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "lage ASCII-beskyttet output"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr ""
-
-#: sm/gpgsm.c:329
-#, fuzzy
-msgid "use the default key as default recipient"
-msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "leser valg fra �%s�\n"
-#: sm/gpgsm.c:351
-#, fuzzy
-msgid "force v3 signatures"
-msgstr "sjekke signaturer"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr ""
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:361
+#: sm/gpgsm.c:297
#, fuzzy
-msgid "add this keyring to the list of keyrings"
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "hent n�klene fra dette n�kkelknippet"
-#: sm/gpgsm.c:362
-#, fuzzy
-msgid "add this secret keyring to the list"
-msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:365
-#, fuzzy
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAVN|kryptere for NAVN"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr ""
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "ukjent kryptoalgoritme"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s signatur, digestalgoritme %s\n"
-#: sm/gpgsm.c:395
-#, fuzzy
-msgid "|N|use compress algorithm N"
-msgstr "ukjent kompresjonsalgoritme"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7457,60 +7413,60 @@ msgstr ""
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "bruksm�te: gpg [valg] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "kan ikke opprette �%s�: %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "ukjent valg �%s�\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = hopp over denne n�kkelen\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "kunne ikke parse n�kkelserverens URL\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan ikke aksere �%s�: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7838,6 +7794,10 @@ msgstr ""
msgid "do not allow the reuse of old passphrases"
msgstr "feil ved opprettelse av passfrase: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8170,6 +8130,37 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "generere PGP 2.x-kompatible meldinger"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[fil]|lage en signatur"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[fil]|lage en klartekstsignatur"
+
+#, fuzzy
+#~ msgid "use the default key as default recipient"
+#~ msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
+
+#, fuzzy
+#~ msgid "force v3 signatures"
+#~ msgstr "sjekke signaturer"
+
+#, fuzzy
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
+
+#, fuzzy
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAVN|kryptere for NAVN"
+
+#, fuzzy
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "ukjent kompresjonsalgoritme"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
diff --git a/po/pl.po b/po/pl.po
index a5236a82c..724fab87a 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2007-11-26 19:01+0100\n"
"Last-Translator: Jakub Bogusz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
@@ -92,7 +92,7 @@ msgstr "Has�o"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -102,12 +102,12 @@ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -311,14 +311,14 @@ msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "z dodatkowymi informacjami"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "mniej komunikat�w"
@@ -330,7 +330,7 @@ msgstr "wyj�cie polece� w stylu sh"
msgid "csh-style command output"
msgstr "wyj�cie polece� w stylu csh"
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|PLIK|odczyt opcji z PLIKU"
@@ -395,7 +395,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr "|PLIK|zapis ustawie� �rodowiska tak�e do PLIKU"
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "B��dy prosimy zg�asza� na adres <"
@@ -412,30 +412,30 @@ msgstr ""
"Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarz�dzanie kluczem tajnym dla GnuPG\n"
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
@@ -1428,7 +1428,7 @@ msgstr "Niepoprawne polecenie (spr�buj ,,help'')\n"
msgid "--output doesn't work for this command\n"
msgstr "opcja --output nie dzia�a z tym poleceniem\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -1735,7 +1735,7 @@ msgstr "u�ywany jest podklucz %s zamiast klucza g��wnego %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "klucz %s: klucz tajny bez klucza jawnego - pomini�ty\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1743,35 +1743,37 @@ msgstr ""
"@Polecenia:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[plik]|z�o�enie podpisu"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "szyfrowanie danych"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lne)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "lista kluczy"
@@ -1783,11 +1785,11 @@ msgstr "lista kluczy i podpis�w"
msgid "list and check key signatures"
msgstr "wypisanie i sprawdzenie podpis�w kluczy"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
@@ -1795,79 +1797,80 @@ msgstr "lista kluczy prywatnych"
msgid "generate a new key pair"
msgstr "generacja nowej pary kluczy"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu uniewa�nienia klucza"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "eksport kluczy do pliku"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "import kluczy z serwera kluczy"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "szukanie kluczy na serwerze"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "od�wie�enie wszystkich kluczy z serwera"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "import/do��czenie kluczy"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "wy�wietlenie stanu karty"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "zmiana danych na karcie"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "zmiana PIN-u karty"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [pliki]|skr�ty wiadomo�ci"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
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
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1878,48 +1881,47 @@ msgstr ""
"Opcje:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "identyfikator do podpisania lub odszyfrowania"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|poziom kompresji N (0 - bez)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "pytanie przed nadpisaniem plik�w"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "�cis�e zachowanie OpenPGP"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "generowanie wiadomo�ci zgodnych z PGP 2.x"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1927,7 +1929,7 @@ msgstr ""
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1949,15 +1951,15 @@ msgstr ""
" --list-keys [nazwy] pokazanie klucze\n"
" --fingerprint [nazwy] pokazanie odcisk�w kluczy\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1967,7 +1969,7 @@ msgstr ""
"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1975,80 +1977,80 @@ msgstr ""
"\n"
"Obs�ugiwane algorytmy:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Asymetryczne: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Symetryczne: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Skr�t�w: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Kompresji: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "wywo�anie: gpg [opcje]"
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu domowego ,,%s''\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do pliku konfiguracyjnego ,,%s''\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do rozszerzenia ,,%s''\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu domowego ,,%s''\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do pliku konfiguracyjnego ,,%s''\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do rozszerzenia ,,%s''\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2056,21 +2058,21 @@ msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2078,485 +2080,486 @@ msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika na listach kluczy"
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
"biblioteka libgcrypt jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "niezrozumia�y URL serwera kluczy\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje serwera kluczy\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wypisywania\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "niepoprawne opcje wypisywania\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika przy sprawdzaniu "
"podpis�w"
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
msgid "show only the primary user ID in signature verification"
msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr "sprawdzanie podpis�w z danymi PKA"
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "niepoprawne opcje sprawdzania\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w po��czeniu z %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nie zadzia�a z niebezpieczn� pami�ci� z powodu %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
"tekstu\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm kompresji jest niepoprawny\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "niew�a�ciwe domy�lne ustawienia\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "niew�a�ciwe ustawienia szyfr�w\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "niew�a�ciwe ustawienia skr�t�w\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie dzia�a z %s!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [plik]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [plik]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "nie mo�na u�y� --symmetric --encrypt wraz z --s2k-mode 0\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nie mo�na u�y� --symmetric --encrypt w trybie %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [plik]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [plik]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "nie mo�na u�y� --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nie mo�na u�y� --symmetric --sign --encrypt w trybie %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[nazwa pliku]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "pobieranie kluczy z tego zbioru"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "nie traktowa� konfliktu datownik�w jako b��du"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|pisanie opisu stanu do deskryptora FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6383,70 +6386,70 @@ msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
msgid "can't open fd %d: %s\n"
msgstr "nie mo�na otworzy� fd %d: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
msgid "argument not expected"
msgstr "nieoczekiwany argument"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
msgid "read error"
msgstr "b��d odczytu"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
msgid "keyword too long"
msgstr "s�owo kluczowe zbyt d�ugie"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
msgid "missing argument"
msgstr "brak argumentu"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
msgid "invalid command"
msgstr "b��dne polecenie"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
msgid "invalid alias definition"
msgstr "b��dna definicja aliasu"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "[B��d - brak pami�ci]"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
msgid "invalid option"
msgstr "b��dna opcja"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr "brak argumentu dla opcji ,,%.50s''\n"
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr "opcja ,,%.50s'' nie mo�e mie� argument�w\n"
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "b��dne polecenie ,,%.50s''\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr "opcja ,,%.50s'' jest niejednoznaczna\n"
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "[B��d - brak pami�ci]"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "b��dna opcja ,,%.50s''\n"
@@ -6782,7 +6785,7 @@ msgstr "|N|Nowy PIN"
msgid "run in multi server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
msgid "read options from file"
msgstr "odczyt opcji z pliku"
@@ -7376,178 +7379,140 @@ msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
msgid "no valid recipients given\n"
msgstr "nie podano poprawnych adresat�w\n"
-#: sm/gpgsm.c:248
-msgid "|[FILE]|make a signature"
-msgstr "|[PLIK]|z�o�enie podpisu"
-
-#: sm/gpgsm.c:249
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[PLIK]|z�o�enie podpisu z zachowaniem czytelno�ci dokumentu"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
msgid "list external keys"
msgstr "wypisanie kluczy zewn�trznych"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
msgid "list certificate chain"
msgstr "wypisanie �a�cucha certyfikat�w"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
msgid "import certificates"
msgstr "import certyfikat�w"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
msgid "export certificates"
msgstr "eksport certyfikat�w"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr "zarejestrowanie karty procesorowej"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr "przekazanie polecenia do dirmngr"
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr "wywo�anie gpg-protect-tool"
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
msgid "change a passphrase"
msgstr "zmiana has�a"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
msgid "create base-64 encoded output"
msgstr "tworzenie wyj�cia zakodowanego base-64"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr "przyj�cie wej�cia w formacie PEM"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr "przyj�cie wej�cia w formacie base-64"
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr "przyj�cie wej�cia w formacie binarnym"
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr "u�ycie systemowego dirmngr je�li jest dost�pny"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr "pomini�cie CRL"
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr "sprawdzenie poprawno�ci przy u�yciu OCSP"
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr "|N|liczba certyfikat�w do do��czenia"
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr "nie sprawdzanie polityk certyfikat�w"
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr "pobranie brakuj�cych certyfikat�w wystawc�w"
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego adresata"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "u�ycie domy�lnego klucza jako domy�lnego adresata"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "nie u�ywanie w og�le terminala"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
#, fuzzy
msgid "|FILE|write a server mode log to FILE"
msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "wymuszenie podpis�w v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "u�ywanie zawsze MDC do szyfrowania"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "tryb wsadowy: bez �adnych pyta�"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "przyj�cie odpowiedzi ,,tak'' na wi�kszo�� pyta�"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "przyj�cie odpowiedzi ,,nie'' na wi�kszo�� pyta�"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "dodanie tego zbioru kluczy do listy zbior�w kluczy"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "dodanie tego zbioru kluczy tajnych do listy"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|u�ycie tego serwera do wyszukiwania kluczy"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAZWA|ustawienie zestawu znak�w terminala"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|PLIK|wczytanie modu�u rozszerzenia PLIK"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAZWA|u�ycie tego algorytmu szyfrowania NAZWA"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAZWA|u�ycie tego algorytmu skr�tu wiadomo�ci"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|u�ycie algorytmu kompresji N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Wywo�anie: gpgsm [opcje] [pliki] (-h podaje pomoc)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7558,59 +7523,59 @@ msgstr ""
"MIME\n"
"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
msgid "usage: gpgsm [options] "
msgstr "wywo�anie: gpgsm [opcje]"
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "UWAGA: nie mo�na zaszyfrowa� do ,,%s'': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, c-format
msgid "unknown validation model `%s'\n"
msgstr "nieznany model poprawno�ci ,,%s''\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "linia %d: nie podano nazwy przedmiotu\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " p = pomini�cie tego klucza\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "niezrozumia�y URL serwera kluczy\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr "to polecenie nie zosta�o jeszcze zaimplementowane\n"
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7943,6 +7908,10 @@ msgstr "|N|przedawnianie hase� po N dniach"
msgid "do not allow the reuse of old passphrases"
msgstr "nie zezwalanie na ponowne u�ycie starych hase�"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAZWA|szyfrowanie tak�e dla odbiorcy NAZWA"
@@ -8271,6 +8240,39 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "generowanie wiadomo�ci zgodnych z PGP 2.x"
+
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[PLIK]|z�o�enie podpisu"
+
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[PLIK]|z�o�enie podpisu z zachowaniem czytelno�ci dokumentu"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego adresata"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "u�ycie domy�lnego klucza jako domy�lnego adresata"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "wymuszenie podpis�w v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "u�ywanie zawsze MDC do szyfrowania"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "dodanie tego zbioru kluczy tajnych do listy"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAZWA|ustawienie zestawu znak�w terminala"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|PLIK|wczytanie modu�u rozszerzenia PLIK"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|u�ycie algorytmu kompresji N"
+
#~ msgid "remove key from the public keyring"
#~ msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
diff --git a/po/pt.po b/po/pt.po
index 7778438b7..3f13878ec 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <[email protected]>\n"
"Language-Team: pt <[email protected]>\n"
@@ -95,7 +95,7 @@ msgstr "frase secreta incorrecta"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -105,12 +105,12 @@ msgstr "imposs�vel criar `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -304,14 +304,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detalhado"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
@@ -323,7 +323,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
@@ -394,7 +394,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -411,30 +411,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de op��es `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler op��es de `%s'\n"
@@ -1457,7 +1457,7 @@ msgstr "Comando inv�lido (tente \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output n�o funciona para este comando\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
@@ -1771,7 +1771,7 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1779,35 +1779,37 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[ficheiro]|fazer uma assinatura"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "fazer uma assinatura separada"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "cifrar dados"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra sim�trica"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "decifrar dados (ac��o por omiss�o)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "listar as chaves"
@@ -1820,11 +1822,11 @@ msgstr "listar as chaves e as assinaturas"
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "listar as chaves secretas"
@@ -1832,79 +1834,80 @@ msgstr "listar as chaves secretas"
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves p�blico"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "remover chaves do porta-chaves secreto"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor de chaves"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importar chaves de um servidor de chaves"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "procurar chaves num servidor de chaves"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "actualizar todas as chaves a partir de um servidor de chaves"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "actualizar a base de dados de confian�a"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1915,52 +1918,51 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"usar este identificador de utilizador para\n"
"assinar ou decifrar"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desactiva)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "perguntar antes de sobrep�r"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1968,7 +1970,7 @@ msgstr ""
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1988,15 +1990,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2006,7 +2008,7 @@ msgstr ""
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2014,589 +2016,589 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Chave p�blica: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Cifra: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Dispers�o: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Compress�o: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostrar em que porta-chave a chave est�"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "op��es de importa��o inv�lidas\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "op��es de importa��o inv�lidas\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "prefer�ncias por omiss�o inv�lidas\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/gpgv.c:72
+#: g10/gpgv.c:74
#, fuzzy
-msgid "take the keys from this keyring"
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "Remover esta chave do porta-chaves?"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informa��es de estado para o\n"
"descritor de ficheiro DF"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6494,77 +6496,77 @@ msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
msgid "can't open fd %d: %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "a escrever chave privada para `%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "erro de leitura"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "frase secreta demasiado longa\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "argumento inv�lido"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "comandos em conflito\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "op��es de importa��o inv�lidas\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "n�o processado"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "op��es de importa��o inv�lidas\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Comando inv�lido (tente \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "n�o processado"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "op��es de importa��o inv�lidas\n"
@@ -6901,7 +6903,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "a ler op��es de `%s'\n"
@@ -7524,190 +7526,148 @@ msgstr "remo��o do bloco de chave falhou: %s\n"
msgid "no valid recipients given\n"
msgstr "resposta do agente inv�lida\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[ficheiro]|fazer uma assinatura"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "listar as chaves secretas"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "certificado incorrecto"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "certificado incorrecto"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "certificado incorrecto"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "criar sa�da com armadura ascii"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "for�ar assinaturas v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "sempre usar um MDC para cifrar"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "modo n�o-interactivo: nunca perguntar"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "assumir n�o para a maioria das perguntas"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr ""
"adicionar este porta-chaves\n"
"� lista de porta-chaves"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "adicionar este porta-chaves secreto � lista"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omiss�o"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ENDERE�O|usar este servidor para buscar chaves"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr ""
-"|NOME|definir mapa de caracteres do terminal como\n"
-"NOME"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|usar algoritmo de compress�o N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7718,60 +7678,60 @@ msgstr ""
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "uso: gpg [op��es] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "imposs�vel ligar a `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = saltar esta chave\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "a escrever para `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "imposs�vel fechar `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8102,6 +8062,10 @@ msgstr "|N|usar mode de frase secreta N"
msgid "do not allow the reuse of old passphrases"
msgstr "erro na cria��o da frase secreta: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8436,6 +8400,43 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[ficheiro]|fazer uma assinatura"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[ficheiro]|fazer uma assinatura"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "for�ar assinaturas v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "sempre usar um MDC para cifrar"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "adicionar este porta-chaves secreto � lista"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr ""
+#~ "|NOME|definir mapa de caracteres do terminal como\n"
+#~ "NOME"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usar algoritmo de compress�o N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "remover chaves do porta-chaves p�blico"
@@ -9083,10 +9084,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key id-utilizador"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "fazer uma assinatura separada"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "assina a chave de forma n�o-revog�vel"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 17501f37d..44e7289b1 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -99,7 +99,7 @@ msgstr "frase secreta incorreta"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de prote��o %d n�o � suportado\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -109,12 +109,12 @@ msgstr "imposs�vel criar %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -309,14 +309,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "detalhado"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
@@ -328,7 +328,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
@@ -398,7 +398,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -415,30 +415,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de op��es `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo op��es de `%s'\n"
@@ -1464,7 +1464,7 @@ msgstr "Comando inv�lido (tente \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr ""
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
@@ -1774,7 +1774,7 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1782,37 +1782,39 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[arquivo]|fazer uma assinatura"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "fazer uma assinatura separada"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[arquivo]|fazer uma assinatura em texto puro"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "criptografar dados"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr ""
"criptografar apenas com criptografia\n"
"sim�trica"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "descriptografar dados (padr�o)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "listar as chaves"
@@ -1825,11 +1827,11 @@ msgstr "listar as chaves e as assinaturas"
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "listar as chaves secretas"
@@ -1837,83 +1839,84 @@ msgstr "listar as chaves secretas"
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
#, fuzzy
msgid "remove keys from the public keyring"
msgstr "remover a chave do chaveiro p�blico"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
#, fuzzy
msgid "remove keys from the secret keyring"
msgstr "remover a chave do chaveiro secreto"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importar chaves de um servidor"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
#, fuzzy
msgid "search for keys on a key server"
msgstr "exportar chaves para um servidor"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importar chaves de um servidor"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "atualizar o banco de dados de confiabilidade"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
-msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
+msgstr "imprime todos os \"digests\" de mensagens"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1924,58 +1927,57 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|criptografar para NOME"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"usar este identificador de usu�rio para\n"
"assinar ou descriptografar"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desabilita)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr ""
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1995,15 +1997,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2013,7 +2015,7 @@ msgstr ""
"assina, verifica, criptografa ou descriptografa\n"
"a opera��o padr�o depende dos dados de entrada\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2021,599 +2023,599 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr ""
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr ""
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr ""
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
#, fuzzy
msgid "Compression: "
msgstr "Coment�rio: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "alterna entre listagem de chave secreta e p�blica"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "imposs�vel escrever para o chaveiro: %s\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "chaveiro inv�lido"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
#, fuzzy
msgid "invalid import options\n"
msgstr "armadura inv�lida"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
#, fuzzy
msgid "invalid export options\n"
msgstr "chaveiro inv�lido"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "armadura inv�lida"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "chaveiro inv�lido"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
#, fuzzy
msgid "invalid default preferences\n"
msgstr "lista prefer�ncias"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "lista prefer�ncias"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "lista prefer�ncias"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "lista prefer�ncias"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [nome_do_arquivo]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "descriptografia falhou: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_arquivo]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [nome_do_arquivo]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_arquivo]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_arquivo]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key id-usu�rio"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usu�rio"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usu�rio [comandos]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record falhou: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
# "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash inv�lido `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[nome_do_arquivo]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "V� em frente e digite sua mensagem ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
#, fuzzy
msgid "the given certification policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
#, fuzzy
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpgv.c:72
+#: g10/gpgv.c:74
#, fuzzy
-msgid "take the keys from this keyring"
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "Deletar esta chave do chaveiro? "
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr ""
"|DA|escrever informa��es de estado para o\n"
"descritor de arquivo DA"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
#, fuzzy
msgid ""
"Syntax: gpg [options] [files]\n"
@@ -6499,78 +6501,78 @@ msgstr "linha %u muito longa ou sem LF\n"
msgid "can't open fd %d: %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "escrevendo certificado privado para `%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "erro de leitura"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "linha muito longa\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "argumento inv�lido"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "comandos conflitantes\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "armadura inv�lida"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "n�o processado(s)"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "armadura inv�lida"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
# help ou ajuda ???
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Comando inv�lido (tente \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "n�o processado(s)"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "armadura inv�lida"
@@ -6908,7 +6910,7 @@ msgstr "Digite o identificador de usu�rio: "
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "lendo op��es de `%s'\n"
@@ -7538,188 +7540,146 @@ msgstr "enumera��o de blocos de chaves falhou: %s\n"
msgid "no valid recipients given\n"
msgstr "nenhum endere�o v�lido\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[arquivo]|fazer uma assinatura"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[arquivo]|fazer uma assinatura em texto puro"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "listar as chaves secretas"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "Certificado de revoga��o v�lido"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "Certificado correto"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "Certificado correto"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "criar sa�da com armadura ascii"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|usar NOME como destinat�rio padr�o"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "usar a chave padr�o como destinat�rio padr�o"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "for�ar assinaturas v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "sempre usar um MDC para criptografar"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "modo n�o-interativo: nunca perguntar"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "assumir n�o para a maioria das perguntas"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "adicionar este chaveiro � lista de chaveiros"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "adicionar este chaveiro secreto � lista"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NOME|usar NOME como chave secreta padr�o"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|ENDERE�O|usar este servidor para buscar chaves"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr ""
-"|NOME|definir mapa de caracteres do terminal como\n"
-"NOME"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|usar algoritmo de compress�o N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7730,60 +7690,60 @@ msgstr ""
"assina, verifica, criptografa ou descriptografa\n"
"a opera��o padr�o depende dos dados de entrada\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "Uso: gpgm [op��es] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "destinat�rio padr�o desconhecido `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr "chave %08lX: subchave ignorada\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "imposs�vel escrever para o chaveiro: %s\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "escrevendo para `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8114,6 +8074,10 @@ msgstr "|N|usar frase secreta modo N"
msgid "do not allow the reuse of old passphrases"
msgstr "erro na cria��o da frase secreta: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|usar NOME como chave secreta padr�o"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8448,6 +8412,46 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[arquivo]|fazer uma assinatura"
+
+#~ msgid "|algo [files]|print message digests"
+#~ msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[arquivo]|fazer uma assinatura"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[arquivo]|fazer uma assinatura em texto puro"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOME|usar NOME como destinat�rio padr�o"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usar a chave padr�o como destinat�rio padr�o"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "for�ar assinaturas v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "sempre usar um MDC para criptografar"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "adicionar este chaveiro secreto � lista"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr ""
+#~ "|NOME|definir mapa de caracteres do terminal como\n"
+#~ "NOME"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usar algoritmo de compress�o N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "remover a chave do chaveiro p�blico"
@@ -8908,10 +8912,6 @@ msgstr ""
#~ msgstr "--sign-key id-usu�rio"
#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "fazer uma assinatura separada"
-
-#, fuzzy
#~ msgid "sign the key non-revocably"
#~ msgstr "assina a chave localmente"
@@ -9718,9 +9718,6 @@ msgstr ""
#~ msgid "tdbio_search_sdir failed: %s\n"
#~ msgstr "tdbio_search_dir falhou: %s\n"
-#~ msgid "print all message digests"
-#~ msgstr "imprime todos os \"digests\" de mensagens"
-
#~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
#~ msgstr ""
#~ "NOTA: assinatura rec %lu[%d] est� na lista de sugest�es de %lu mas est�\n"
diff --git a/po/ro.po b/po/ro.po
index 0343c278a..3096bd97c 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
"Language-Team: Romanian <[email protected]>\n"
@@ -98,7 +98,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -108,12 +108,12 @@ msgstr "nu pot crea `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nu pot deschide `%s': %s\n"
@@ -308,14 +308,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "locvace"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "fii oarecum mai t�cut"
@@ -327,7 +327,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
@@ -397,7 +397,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -414,30 +414,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "fi�ier op�iuni `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "citesc op�iuni din `%s'\n"
@@ -1434,7 +1434,7 @@ msgstr "Comand� invalid� (�ncerca�i \"ajutor\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru aceast� comand�\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "nu pot deschide `%s'\n"
@@ -1746,7 +1746,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� f�r� cheie public� - s�rit�\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1754,35 +1754,37 @@ msgstr ""
"@Comenzi:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[fi�ier]|creaz� o semn�tur�"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "creaz� o semn�tur� deta�at�"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "cifreaz� datele"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "cifreaz� numai cu cifru simetric"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "decripteaz� datele (implicit)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verific� o semn�tur�"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "enumer� chei"
@@ -1794,11 +1796,11 @@ msgstr "enumer� chei �i semn�turi"
msgid "list and check key signatures"
msgstr "enumer� �i verific� semn�turile cheii"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "enumer� chei �i amprente"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "enumer� chei secrete"
@@ -1806,79 +1808,80 @@ msgstr "enumer� chei secrete"
msgid "generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "�terge chei de pe inelul de chei public"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "�terge chei de pe inelul de chei secret"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "semneaz� o cheie"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "semneaz� o cheie local"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "semneaz� sau editeaz� o cheie"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "genereaz� un certificat de revocare"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "export� chei"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "export� chei pentru un server de chei"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "import� chei de la un server de chei"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "caut� pentru chei pe un server de chei"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "actualizeaz� toate cheile de la un server de chei"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "import�/combin� chei"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "afi�eaz� starea cardului"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "schimb� data de pe card"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "schimb� PIN-ul unui card"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "actualizeaz� baza de date de �ncredere"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1889,48 +1892,47 @@ msgstr ""
"Op�iuni:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "creaz� ie�ire �n armur� ascii"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NUME|cifrare pentru NUME"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "folose�te modul text canonic"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "�ntreab� �nainte de a suprascrie"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "folose�te comportament strict OpenPGP"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "genereaz� mesaje compatibile cu PGP 2.x"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1938,7 +1940,7 @@ msgstr ""
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1958,15 +1960,15 @@ msgstr ""
" --list-keys [nume] arat� chei\n"
" --fingerprint [nume] arat� amprente\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Raporta�i bug-uri la <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1976,7 +1978,7 @@ msgstr ""
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1984,81 +1986,81 @@ msgstr ""
"\n"
"Algoritmuri suportate:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Cifru: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Compresie: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "folosire: gpg [op�iuni] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "comenzi �n conflict\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2066,21 +2068,21 @@ msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
"configurare `%s'\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"extensia `%s'\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2088,491 +2090,492 @@ msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
"configurare `%s'\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"extensia `%s'\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "articol configurare necunoscut `%s'\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' nu este un set de carectere valid\n"
#
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op�iuni server de chei invalide\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "op�iuni server de chei invalide\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op�iuni import invalide\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "op�iuni import invalide\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op�iuni export invalide\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "op�iuni export invalide\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op�iuni enumerare invalide\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "op�iuni enumerare invalide\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "op�iuni verificare invalide\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execu�ie ca %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
"--pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
"activat.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "preferin�e implicite invalide\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "preferin�e cifrare personale invalide\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "preferin�e rezumat personale invalide\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "preferin�e compresie personale invalide\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge �nc� cu %s!\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
"public�\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [nume_fi�ier]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [nume_fi�ier]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [nume_fi�ier]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nume_fi�ier]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [nume_fi�ier]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fi�ier]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [nume_fi�ier]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fi�ier]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizator"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizator"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizator [comenzi]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei e�uat�: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recep�ie server de chei e�uat�: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie e�uat: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "c�utare server de chei e�uat�: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei e�uat�: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a e�uat: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a e�uat: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritm hash invalid `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[nume_fi�ier]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "ia cheile de pe acest inel de chei"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "d� numai un avertisment la conflicte de timestamp"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|scrie informa�ii de stare �n acest FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6385,77 +6388,77 @@ msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
msgid "can't open fd %d: %s\n"
msgstr "nu pot deschide `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "Nu sunt permise comenzi administrare\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "eroare citire fi�ier"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "linie prea lung�"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "argument invalid"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "Comand� numai-administrare\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "op�iuni enumerare invalide\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "nefor�at(�)"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "op�iuni enumerare invalide\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Comand� invalid� (�ncerca�i \"ajutor\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "nefor�at(�)"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "op�iuni enumerare invalide\n"
@@ -6789,7 +6792,7 @@ msgstr "|N|PIN Nou"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "citesc op�iuni din `%s'\n"
@@ -7412,187 +7415,147 @@ msgstr "stergere keyblock a e�uat: %s\n"
msgid "no valid recipients given\n"
msgstr "(Nici o descriere dat�)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[fi�ier]|creaz� o semn�tur�"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "enumer� chei secrete"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "certificat incorect"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "certificat incorect"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "certificat incorect"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
#, fuzzy
msgid "register a smartcard"
msgstr "adaug� o cheie la un smartcard"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "schimb� fraza-parol�"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "creaz� ie�ire �n armur� ascii"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NUME|folose�te NUME ca destinatar implicit"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "folose�te cheia implicit� ca destinatar implicit"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "nu folosi deloc terminalul"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "for�eaz� semn�turi v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "modul batch: nu �ntreba niciodat�"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "presupune da la cele mai multe �ntreb�ri"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "presupune nu la cele mai multe �ntreb�ri"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "adaug� acest inel de chei la lista inelelor de chei"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "adaug� acest inel de chei secret la list�"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NUME|folose�te algoritm cifrare NUME"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|folose�te algoritm compresie N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7603,61 +7566,61 @@ msgstr ""
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "folosire: gpg [op�iuni] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "nu m� pot conecta la `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "op�iune necunoscut� `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Nici o descriere dat�)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = s�ri peste cheia asta\n"
#
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nu pot accesa `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7986,6 +7949,10 @@ msgstr "|N|folose�te modul fraz�-parol� N"
msgid "do not allow the reuse of old passphrases"
msgstr "eroare la crearea frazei-parol�: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8320,6 +8287,41 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "genereaz� mesaje compatibile cu PGP 2.x"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[fi�ier]|creaz� o semn�tur�"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NUME|folose�te NUME ca destinatar implicit"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "folose�te cheia implicit� ca destinatar implicit"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "for�eaz� semn�turi v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "adaug� acest inel de chei secret la list�"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|folose�te algoritm compresie N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "�terge chei de pe inelul de chei public"
diff --git a/po/ru.po b/po/ru.po
index a05566701..7f8735926 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2006-11-07 19:31+0300\n"
"Last-Translator: Maxim Britov <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
@@ -88,7 +88,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -98,12 +98,12 @@ msgstr "не могу создать `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "не могу открыть `%s': %s\n"
@@ -291,14 +291,14 @@ msgstr "запуск в режиме сервера (foreground)"
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "подробно"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "уменьшить количество выводимой информации"
@@ -310,7 +310,7 @@ msgstr "вывод результатов в sh-стиле"
msgid "csh-style command output"
msgstr "вывод результатов в csh-стиле"
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|FILE|взять параметры из FILE"
@@ -375,7 +375,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr "|FILE|сохранить состояние в файл"
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "О найденных ошибках сообщайте <"
@@ -392,30 +392,30 @@ msgstr ""
"Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
"Управление закрытыми ключами для GnuPG\n"
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "запрошен недупустимый уровень отладки `%s'\n"
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл конфигурации `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "параметры конфигурации из файла `%s'\n"
@@ -1407,7 +1407,7 @@ msgstr "Недопустимая команда (список команд: \"h
msgid "--output doesn't work for this command\n"
msgstr "--output не работает для данной команды\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "не могу открыть `%s'\n"
@@ -1710,7 +1710,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1718,35 +1718,37 @@ msgstr ""
"@Команды:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[файл]|создать подпись к файлу"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[файл]|создать прозрачную подпись к файлу"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "создать отделенную подпись"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "зашифровать данные"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "зашифровать только симметричным шифром"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "проверить подпись"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "вывести список ключей"
@@ -1758,11 +1760,11 @@ msgstr "вывести список ключей и подписей"
msgid "list and check key signatures"
msgstr "вывести и проверить подписи ключей"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "вывести список секретных ключей"
@@ -1770,79 +1772,80 @@ msgstr "вывести список секретных ключей"
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "удалить ключи из таблицы закрытых ключей"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "подписать ключ"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "подписать ключ локально"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "экспортировать ключи"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "экспортировать ключи на сервер ключей"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "импортировать ключи с сервера ключей"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "искать ключи на сервере ключей"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "обновить все ключи с сервера ключей"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "импортировать/объединить ключи"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "показать состояние карты"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "изменить данные на карте"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "сменить PIN карты"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "обновить таблицу доверий"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [файлы]|вывести хэши файлов"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr "запуск в режиме сервера"
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1853,48 +1856,47 @@ msgstr ""
"Параметры:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "вывод в ASCII формате"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAME|зашифровать для получателя NAME"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "использовать данный User ID для подписывания и расшифрования"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|установить уровень сжатия N (0 без сжатия)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|взять параметры из FILE"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "не делать никаких изменений"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "спросить перед перезаписью"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "строго следовать стандарту OpenPGP"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "создает сообщение совместимым с PGP 2.x"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1902,7 +1904,7 @@ msgstr ""
"@\n"
"(См. документацию для более полного ознакомления с командами и параметрами)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1922,15 +1924,15 @@ msgstr ""
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1940,7 +1942,7 @@ msgstr ""
"Подписи и их проверка, зашифрование и расшифрование\n"
"действие по умолчанию зависит от входных данных\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1948,96 +1950,96 @@ msgstr ""
"\n"
"Поддерживаются следующие алгоритмы:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "С открытым ключом: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Симметричные шифры: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Хэш-функции: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "использование: gpg [параметры] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "отсутствует знак = в определении группы `%s'\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа у домашнего каталога `%s'\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа у файла конфигурации `%s'\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа у файла модуля расширения `%s'\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасные права доступа у каталога содержащего домашний каталог "
"`%s'\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2045,481 +2047,482 @@ msgstr ""
"ВНИМАНИЕ: небезопасные права доступа у каталога содержащего файл "
"конфигурации `%s'\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
"расширения `%s'\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "неизвестный параметр в файле конфигурации `%s'\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr "отображать Фото ID при распечатке ключей"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr "показывать ссылку на политики при распечатке подписей"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr "показывать все примечания в списке подписей"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
"показывать добавленные пользователем примечания при распечатке подписей"
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr "показываеть предпочитаемый сервер ключей с списке подписей"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr "показывать действительность Used ID при распечатке ключей"
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr "показывать отозванные и просроченные ключи при распечатке списка"
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "печатать имя таблиц ключей в списке ключей"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr "печатать даты истечения в списке подписей"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' недопустимый срок действия подписи\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' недопустимая таблица символов\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "не могу проанализировать URL сервера ключей\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры для сервера ключей\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимый список параметров\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "недопустимый список параметров\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr "показывать Фото ID при проверке подписи"
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr "показывать ссылку на политики при проверке подписи"
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr "показывать все примечания в процессе проверки подписей"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr "показывать добавленные пользователем примечания при проверке подписей"
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr "печатать действительность UserID при проверке подписей"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr "показывать отозванные и просроченные User ID при проверке подписей"
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "показывать отозванные и просроченные User ID при проверке подписей"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки \n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимый список auto-key-locate\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ВНИМАНИЕ: %s заместит %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не допускается использовать с %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s не имеет смысла совместно с %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран неверный алгоритм шифрования\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана неверная хэш-функция\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "выбран неверный алгоритм сжатия\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана неверная хэш-функция для сертификации\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые персональные предпочтения шифра\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "недопустимые персональные предпочтения хэш-функции\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверий: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [файл]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [файл]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "симметричное шифрование `%s' не удалось: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [файл]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [файл]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [файл]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [файл]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [файл]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [файл]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [файл]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [файл]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [команды]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из ASCII формата: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в ASCII формат: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "недопустимая хэш-функция `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[файл]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Набирайте Ваше сообщение ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL политики сертификации неверен\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL политики подписи неверен\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "используются ключи из этой таблицы ключей"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "при несоответствии отметки времени - только предупреждением"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6286,74 +6289,74 @@ msgstr "входная строка %u слишком длинная или пр
msgid "can't open fd %d: %s\n"
msgstr "не могу открыть `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "Команды администрирования не разрешены\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "ошибка чтения в `%s': %s\n"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "строка слишком длинная"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
msgid "missing argument"
msgstr ""
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "Команды администратора\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "недопустимый список параметров\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
msgid "out of core"
msgstr ""
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "недопустимый список параметров\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, fuzzy, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr "параметр \"%s\" требует программы и опциональных аргументов\n"
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Недопустимая команда (список команд: \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, fuzzy, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr "параметр \"%s\" игнорирован по причине \"%s\"\n"
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
msgid "out of core\n"
msgstr ""
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "недопустимый список параметров\n"
@@ -6688,7 +6691,7 @@ msgstr "|N|Новый PIN"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
msgid "read options from file"
msgstr "получение параметров конфигурации из файла"
@@ -7293,178 +7296,140 @@ msgstr "удаление сертификата \"%s\" неудачно: %s\n"
msgid "no valid recipients given\n"
msgstr "не заданы получатели\n"
-#: sm/gpgsm.c:248
-msgid "|[FILE]|make a signature"
-msgstr "|[файл]|создать подпись"
-
-#: sm/gpgsm.c:249
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[файл]|создать прозрачную подпись"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
msgid "list external keys"
msgstr "вывести список внешних ключей"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
msgid "list certificate chain"
msgstr "вывести список правил сертификатов"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
msgid "import certificates"
msgstr "импорт сертификатов"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
msgid "export certificates"
msgstr "экспорт сертификатов"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr "зарегистрировать смарткарту"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr "передать команду dirmngr"
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr "вызываем gpg-protect-tool"
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
msgid "change a passphrase"
msgstr "сменить фразу-пароль"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
msgid "create base-64 encoded output"
msgstr "вывод в BASE64"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr "предполагаем получение в формате PEM"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr "предполагаем получение в формате BASE64"
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr "предполагаем получение в двоичном формате"
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr "используем системный dirmngr, если доступен"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr "не сверять с CRL"
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr "проверка действительности используя OCSP"
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr "|N|число включаемых сертификатов"
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr "|FILE|взять информацию о политиках из FILE"
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr "не проверять политики сертификата"
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr "запросить пропущенных издаталей сертификатов"
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAME|использовать NAME как получателя по умолчанию"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "использовать ключ по умолчанию как получателя по умолчанию"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "не использовать терминал совсем"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
#, fuzzy
msgid "|FILE|write a server mode log to FILE"
msgstr "|FILE|сохранять журнал режима сервера в FILE"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|FILE|сохранять журнал режима сервера в FILE"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "принудительная подпись v3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "всегда использовать MDC для шифрования"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "пакетный режим: ничего не запрашивать"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "предполагать Да на большинство вопросов"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "предполагать Нет на большинство вопросов"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "добавить данную таблицу ключей в список таблиц ключей"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "добавить данную таблицу секретных ключей в список"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|HOST|использовать данный сервер ключей для поиска ключей"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|установить кодировку терминала в NAME"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LEVEL|установить уровень отладки в LEVEL"
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FILE|загрузить модуль дополнения FILE"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|использовать алгоритм шифрования NAME"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|использовать хеш-функцию NAME"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|использовать алгоритм сжатия N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Использование: gpgsm [параметры] [файлы] (-h для подсказки)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7475,59 +7440,59 @@ msgstr ""
"протокол\n"
"операция по умолчанию зависит от входных данных\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
msgid "usage: gpgsm [options] "
msgstr "использование: gpgsm [параметры] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "не могу зашифровать для `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "неизвестный параметр `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(Пояснения отсутствуют)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = пропустить этот ключ\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "не могу проанализировать URL сервера ключей\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "невозможно подписать используя `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr "данная команды всё еще не реализована\n"
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7855,6 +7820,10 @@ msgstr "|N|кеш PIN просрочен после N секунд"
msgid "do not allow the reuse of old passphrases"
msgstr "разрешить предустановленную фразу-пароль"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8186,6 +8155,39 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "создает сообщение совместимым с PGP 2.x"
+
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[файл]|создать подпись"
+
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[файл]|создать прозрачную подпись"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAME|использовать NAME как получателя по умолчанию"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "использовать ключ по умолчанию как получателя по умолчанию"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "принудительная подпись v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "всегда использовать MDC для шифрования"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "добавить данную таблицу секретных ключей в список"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAME|установить кодировку терминала в NAME"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FILE|загрузить модуль дополнения FILE"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|использовать алгоритм сжатия N"
+
#~ msgid "remove key from the public keyring"
#~ msgstr "удалить ключ из таблицы открытых ключей"
diff --git a/po/sk.po b/po/sk.po
index 2a56b0eb4..33c1b8570 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <[email protected]>\n"
"Language-Team: Slovak <[email protected]>\n"
@@ -91,7 +91,7 @@ msgstr "nespr�vne heslo"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -101,12 +101,12 @@ msgstr "nem��em vytvori� `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nem��em otvori� `%s': %s\n"
@@ -300,14 +300,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "s dodato�n�mi inform�ciami"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "by� o trochu tich��"
@@ -319,7 +319,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
@@ -389,7 +389,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -408,30 +408,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "s�bor s mo�nos�ami `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "��tam mo�nosti z `%s'\n"
@@ -1453,7 +1453,7 @@ msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output pre tento pr�kaz nefunguje\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "nemo�no otvori� `%s'\n"
@@ -1770,7 +1770,7 @@ msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1778,35 +1778,37 @@ msgstr ""
"@Pr�kazy:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[s�bor]|vytvori� podpis"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "vytvori� podpis oddelen� od dokumentu"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "�ifrova� d�ta"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "�ifrovanie len so symetrickou �ifrou"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "de�ifrova� d�ta (implicitne)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "verifikova� podpis"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "vyp�sa� zoznam k���ov"
@@ -1819,11 +1821,11 @@ msgstr "vyp�sa� zoznam k���ov a podpisov"
msgid "list and check key signatures"
msgstr "skontrolova� podpisy k���ov"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "vyp�sa� zoznam k���ov a fingerprintov"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
@@ -1831,79 +1833,80 @@ msgstr "vyp�sa� zoznam tajn�ch k���ov"
msgid "generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "podp�sa� k���"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "podp�sa� k��� lok�lne"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "podp�sa� alebo modifikova� k���"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "vytvori� revoka�n� certifik�t"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exportova� k���e"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exportova� k���e na server k���ov"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importova� k���e zo servera k���ov"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "vyh�ada� k���e na serveri k���ov"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "aktualizova� v�etky k���e zo servera k���ov"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importova�/zl��i� k���e"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "aktualizova� datab�zu d�very"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [s�bory]|vyp�� hash"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1914,52 +1917,51 @@ msgstr ""
"Mo�nosti:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|MENO|�ifrova� pre MENO"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"pou�i� toto id u��vate�a na podp�sanie\n"
" alebo de�ifrovanie"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
" komprim�cia)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "pou�i� k�nonick� textov� m�d"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "nevykona� �iadne zmeny"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "vy�iada� potvrdenie pred prep�san�m"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr ""
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1968,7 +1970,7 @@ msgstr ""
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1988,17 +1990,17 @@ msgstr ""
" --list-keys [men�] vyp�sa� k���e\n"
" --fingerprint [men�] vyp�sa� fingerprinty\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
"Pripomienky k prekladu <[email protected]>.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2008,7 +2010,7 @@ msgstr ""
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2016,590 +2018,591 @@ msgstr ""
"\n"
"Podporovan� algoritmy:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Verejn� k���e: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "�ifry: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Kompresia: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "pou�itie: gpg [mo�nosti] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "konfliktn� pr�kazy\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
#, fuzzy
msgid "show all notations during signature listings"
msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "neplatn� parameter pre import\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parameter pre import\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prep��e %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�va s %s zmysel!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
"ako text\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� predvo�by\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s e�te nepracuje s %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nem��em inicializova� datab�zu d�very: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [meno s�boru]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [meno s�boru]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [meno s�boru]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"pou�itie %s nie je v m�de %s dovolen�\n"
"\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [meno s�boru]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"pou�itie %s nie je v m�de %s dovolen�\n"
"\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno s�boru]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [meno s�boru]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [meno s�boru]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key id u��vate�a"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key id u��vate�a"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u��vate�a [pr�kazy]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa n�js� server: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualiz�cia servera zlyhala: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[meno s�boru]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Za�nite p�sa� svoju spr�vu ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "Zmaza� tento k��� zo s�boru k���ov? "
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "konflikt �asov�ho raz�tka"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6500,77 +6503,77 @@ msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
msgid "can't open fd %d: %s\n"
msgstr "nem��em otvori� `%s': %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "zapisujem tajn� k��� do `%s'\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "chyba pri ��tan� s�boru"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "riadok je pr�li� dlh�\n"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "neplatn� argument"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "konfliktn� pr�kazy\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "neplatn� parameter pre import\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "nespracovan�"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "neplatn� parameter pre import\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "nespracovan�"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "neplatn� parameter pre import\n"
@@ -6909,7 +6912,7 @@ msgstr ""
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "��tam mo�nosti z `%s'\n"
@@ -7529,192 +7532,150 @@ msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
msgid "no valid recipients given\n"
msgstr "(�iadny popis)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[s�bor]|vytvori� podpis"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "nespr�vny certifik�t"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "nespr�vny certifik�t"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "nespr�vny certifik�t"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr ""
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "zmeni� heslo"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr ""
-"pou�i� implicitn� k��� ako implicitn�ho\n"
-" adres�ta"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "v�bec nepou��va� termin�l"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "vyn�ti� podpisy verzie 3"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "na �ifrovanie v�dy pou�i� MDC"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "automaticky odpoveda� �no na v��inu ot�zok"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr ""
"prida� tento s�bor k���ov do zoznamu\n"
" pou��van�ch s�borov k���ov"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
"|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
" k���ov"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|pou�i� kompresn� algoritmus N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7725,60 +7686,60 @@ msgstr ""
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "pou�itie: gpg [mo�nosti] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "nem��em sa pripoji� k `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(�iadny popis)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = presko�i� tento k���\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, fuzzy, c-format
msgid "importing common certificates `%s'\n"
msgstr "zapisujem do '%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "nem��em zavrie� `%s': %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -8109,6 +8070,10 @@ msgstr "|N|pou�i� m�d hesla N"
msgid "do not allow the reuse of old passphrases"
msgstr "chyba pri vytv�ran� hesla: %s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8442,6 +8407,43 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[s�bor]|vytvori� podpis"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[s�bor]|vytvori� podpis"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr ""
+#~ "pou�i� implicitn� k��� ako implicitn�ho\n"
+#~ " adres�ta"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "vyn�ti� podpisy verzie 3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "na �ifrovanie v�dy pou�i� MDC"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|pou�i� kompresn� algoritmus N"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
@@ -9104,10 +9106,6 @@ msgstr ""
#~ msgid "--nrlsign-key user-id"
#~ msgstr "--nrlsign-key id u��vate�a"
-#, fuzzy
-#~ msgid "make a trust signature"
-#~ msgstr "vytvori� podpis oddelen� od dokumentu"
-
#~ msgid "sign the key non-revocably"
#~ msgstr "podp�sa� k��� bez mo�nosti odvola� podpis (non-revocably)"
diff --git a/po/sv.po b/po/sv.po
index 27c3cf4cb..e9781f527 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2008-07-21 09:04+0200\n"
"Last-Translator: Daniel Nylander <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
@@ -115,7 +115,7 @@ msgstr "Lösenfras"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nycklar större än %d bitar stöds inte\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -125,12 +125,12 @@ msgstr "kan inte skapa \"%s\": %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan inte öppna \"%s\": %s\n"
@@ -330,14 +330,14 @@ msgstr "kör i serverläge (förgrund)"
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "utförlig"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "var något tystare"
@@ -349,7 +349,7 @@ msgstr "sh-liknande kommandoutdata"
msgid "csh-style command output"
msgstr "csh-liknande kommandoutdata"
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|FIL|läs inställningar från FIL"
@@ -415,7 +415,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr "|FIL|skriv miljöinställningar även till FIL"
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "Rapportera fel till <"
@@ -432,30 +432,30 @@ msgstr ""
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "ogiltig debug-level \"%s\" angiven\n"
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "OBS: inställningsfilen \"%s\" saknas\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "läser inställningar från \"%s\"\n"
@@ -1442,7 +1442,7 @@ msgid "--output doesn't work for this command\n"
msgstr "--output kan inte användas för detta kommando\n"
# se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "kan inte öppna \"%s\"\n"
@@ -1750,7 +1750,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1758,36 +1758,38 @@ msgstr ""
"@Kommandon:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[fil]|skapa en signatur"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[fil]|skapa en klartextsignatur"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "kryptera data"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "kryptering endast med symmetriskt chiffer"
# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "validera en signatur"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "lista nycklar"
@@ -1799,11 +1801,11 @@ msgstr "lista nycklar och signaturer"
msgid "list and check key signatures"
msgstr "lista och kontrollera nyckelsignaturer"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "lista nycklar och fingeravtryck"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "lista hemliga nycklar"
@@ -1811,80 +1813,81 @@ msgstr "lista hemliga nycklar"
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar från den publika nyckelringen"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "ta bort nycklar från den hemliga nyckelringen"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "signera en nyckel"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "generera ett spärrcertifikat"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "exportera nycklar"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "exportera nycklar till en nyckelserver"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "importera nycklar från en nyckelserver"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "sök efter nycklar hos en nyckelserver"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "importera/slå samman nycklar"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "skriv ut kortstatus"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "ändra data på ett kort"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "ändra PIN-kod för ett kort"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [filer]|skriv ut kontrollsummor"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
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
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1895,49 +1898,48 @@ msgstr ""
"Flaggor:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAMN|kryptera för NAMN"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "använd denna användaridentitet för att signera eller dekryptera"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
msgid "|FILE|write output to FILE"
msgstr "|FIL|skriv utdata till FIL"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "gör inga ändringar"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "fråga innan överskrivning"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "använd strikt OpenPGP-beteende"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "generera PGP 2.x-kompatibla meddelanden"
-
# inställningar istället för flaggor?
# Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1945,7 +1947,7 @@ msgstr ""
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1965,18 +1967,18 @@ msgstr ""
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Rapportera fel till <[email protected]>\n"
"Skicka synpunkter på översättningen till <[email protected]>\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1986,7 +1988,7 @@ msgstr ""
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1994,78 +1996,78 @@ msgstr ""
"\n"
"Algoritmer som stöds:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "Publik nyckel: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Chiffer: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Kontrollsumma: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Komprimering: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr "Använda bibliotek:"
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "användning: gpg [flaggor] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
# Extension är vad? FIXME
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -2073,19 +2075,19 @@ msgstr ""
"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen \"%"
"s\"\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -2093,493 +2095,494 @@ msgstr ""
"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "okänd konfigurationspost \"%s\"\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr "visa foto-id under nyckellistning"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr "visa policy-url:er under signaturlistningar"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr "visa alla notationer under signaturlistningar"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr "visa IETF-standardnotationer under signaturlistningar"
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr "visa användarangivna notationer under signaturlistningar"
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar "
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "visa nyckelringens namn i nyckellistningar"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum under signaturlistningar"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "OBS: %s är inte för normal användning!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "\"%s\" är ingen giltig teckentabell\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka url till nyckelserver\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "ogiltiga flaggor för nyckelserver\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ogiltiga importeringsflaggor\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "ogiltiga importflaggor\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ogiltiga exportflaggor\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "ogiltiga exportinställningar\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ogiltiga listflaggor\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "ogiltiga listflaggor\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr "visa foto-id under signaturvalidering"
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr "visa policy-url:er under signaturvalidering"
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr "visa alla notationer under signaturvalidering"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr "visa IETF-standardnotationer under signaturvalidering"
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr "visa användarangivna notationer under signaturvalidering"
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr "visa giltighet för användaridentitet vid signaturvalidering"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
msgid "show only the primary user ID in signature verification"
msgstr "visa endast primär användaridentitet i signaturvalidering"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr "validera signaturer med PKA-data"
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr "öka tillit på signaturer med giltigt PKA-data"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ogiltiga flaggor för validering\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "ogiltiga flaggor för validering\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunde inte ställa in exec-path till %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr "ogiltig auto-key-locate-lista\n"
# Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
"i --pgp2-läge\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
# IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "vald komprimeringsalgoritm är ogiltig\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
# antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
# antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
# Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
# S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "ogiltiga standardinställningar\n"
# Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "ogiltig inställning av personligt chiffer\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [filnamn]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnamn]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnamn]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key användaridentitet"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key användaridentitet"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key användaridentitet [kommandon]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sändning till nyckelservern misslyckades: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "hämtning från nyckelservern misslyckades: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "sökning på nyckelservern misslyckades: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[filnamn]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "ta nycklarna från denna nyckelring "
# Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
# Kommandot är avsett att användas i "near online system".
# Krav från RIPE.
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6453,70 +6456,70 @@ msgstr "raden %u är för lång, eller saknar nyradstecken\n"
msgid "can't open fd %d: %s\n"
msgstr "kan inte öppna fd %d: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
msgid "argument not expected"
msgstr "argument förväntades inte"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
msgid "read error"
msgstr "läsfel"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
msgid "keyword too long"
msgstr "nyckelordet är för långt"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
msgid "missing argument"
msgstr "argument saknas"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
msgid "invalid command"
msgstr "ogiltigt kommando"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
msgid "invalid alias definition"
msgstr "ogiltig aliasdefinition"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "[Fel - slut på kärna]"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
msgid "invalid option"
msgstr "ogiltig flagga"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr "argument för flaggan \"%.50s\" saknas\n"
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr "flaggan \"%.50s\" förväntar sig inte ett argument\n"
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "ogiltigt kommando \"%.50s\"\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr "flagga \"%.50s\" är tvetydig\n"
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr "kommandot \"%.50s\" är tvetydigt\n"
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "[Fel - slut på kärna]"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "ogiltig flagga \"%.50s\"\n"
@@ -6853,7 +6856,7 @@ msgstr "|N|Initial PIN-kod"
msgid "run in multi server mode (foreground)"
msgstr "kör i multiserverläge (förgrund)"
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
msgid "read options from file"
msgstr "läs inställningar från fil"
@@ -7445,176 +7448,138 @@ msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
msgid "no valid recipients given\n"
msgstr "inga giltiga mottagare angavs\n"
-#: sm/gpgsm.c:248
-msgid "|[FILE]|make a signature"
-msgstr "|[FIL]|skapa en signatur"
-
-#: sm/gpgsm.c:249
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[FIL]|skapa en klartext-signatur"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
msgid "list external keys"
msgstr "lista externa nycklar"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
msgid "list certificate chain"
msgstr "lista certifikatkedja"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
msgid "import certificates"
msgstr "importera certifikat"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
msgid "export certificates"
msgstr "exportera certifikat"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr "registrera ett smartkort"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr "skicka ett kommando till dirmngr"
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr "starta gpg-protect-tool"
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
msgid "change a passphrase"
msgstr "ändra en lösenfras"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
msgid "create base-64 encoded output"
msgstr "skapa base-64-kodat utdata"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr "anta att inmatning är i PEM-format"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr "anta att inmatning är i base-64-format"
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr "anta att inmatning är i binärformat"
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr "använd systemets dirmngr om tillgängligt"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr "kontrollera aldrig mot spärrlista"
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr "kontrollera giltigheten med OCSP"
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr "|N|antal certifikat att inkludera"
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr "|FIL|hämta policyinformation från FIL"
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr "kontrollera inte certifikatpolicier"
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr "hämta saknade utfärdarcertifikat"
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAMN|använd NAMN som standardmottagare"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "använd standardnyckeln som standardmottagare"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "använd inte terminalen alls"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr "|FIL|skriv en serverlägeslogg till FIL"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
msgid "|FILE|write an audit log to FILE"
msgstr "|FIL|skriv en granskningslogg till FIL"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "tvinga v3-signaturer"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "använd alltid en MDC för kryptering"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "satsläge: fråga aldrig"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "anta ja på de flesta frågorna"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "anta nej på de flesta frågorna"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "lägg till denna nyckelring till listan över nyckelringar"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "lägg till denna hemliga nyckelring till listan"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|FIL|läs in tilläggsmodulen FIL"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMN|använd chifferalgoritmen NAMN"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|använd komprimeringsalgoritmen N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Användning: gpgsm [flaggor] [filer] (-h för hjälp)"
# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7624,58 +7589,58 @@ msgstr ""
"signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
"standardåtgärden beror på inmatningsdata\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
msgid "usage: gpgsm [options] "
msgstr "användning: gpgsm [flaggor] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, c-format
msgid "unknown validation model `%s'\n"
msgstr "okänd valideringsmodell \"%s\"\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: inget värdnamn angivet\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: lösenord angivet utan användare\n"
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: hoppar över denna rad\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
msgid "could not parse keyserver\n"
msgstr "kunde inte tolka nyckelserver\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "importerar vanliga certifikat \"%s\"\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "kan inte signera med \"%s\": %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr "det här kommandot har ännu inte implementerats\n"
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@ -8007,6 +7972,10 @@ msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
msgid "do not allow the reuse of old passphrases"
msgstr "tillåt inte återanvändning av gamla lösenfraser"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
@@ -8334,6 +8303,39 @@ msgstr ""
"Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
"Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "generera PGP 2.x-kompatibla meddelanden"
+
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[FIL]|skapa en signatur"
+
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[FIL]|skapa en klartext-signatur"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAMN|använd NAMN som standardmottagare"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "använd standardnyckeln som standardmottagare"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "tvinga v3-signaturer"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "använd alltid en MDC för kryptering"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "lägg till denna hemliga nyckelring till listan"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FIL|läs in tilläggsmodulen FIL"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|använd komprimeringsalgoritmen N"
+
#~ msgid "remove key from the public keyring"
#~ msgstr "ta bort nyckel från den publika nyckelringen"
diff --git a/po/tr.po b/po/tr.po
index 4286feeda..bb1ad4e5c 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2006-11-04 03:45+0200\n"
"Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
"Language-Team: Turkish <[email protected]>\n"
@@ -91,7 +91,7 @@ msgstr "Anahtar Parolası"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -101,12 +101,12 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' açılamıyor: %s\n"
@@ -294,14 +294,14 @@ msgstr "sunucu olarak (önalanda) çalışır"
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "ayrıntılı"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "biraz daha sessiz olur"
@@ -313,7 +313,7 @@ msgstr "sh tarzı komut çıktısı"
msgid "csh-style command output"
msgstr "csh tarzı komut çıktısı"
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|DOSYA|seçenekler DOSYAdan okunur"
@@ -378,7 +378,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: 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 <"
@@ -395,30 +395,30 @@ msgstr ""
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, 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:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
@@ -1412,7 +1412,7 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output seçeneği bu komutla çalışmaz\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' açılamadı\n"
@@ -1720,7 +1720,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1728,35 +1728,37 @@ msgstr ""
"@Komutlar:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[dosya]|bir imza yapar"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "veriyi şifreler"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "bir imzayı doğrular"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "anahtarları listeler"
@@ -1768,11 +1770,11 @@ msgstr "anahtarları ve imzaları listeler"
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
@@ -1780,79 +1782,80 @@ msgstr "gizli anahtarları listeler"
msgid "generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtarlıktan kaldırır"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "anahtarları gizli anahtarlıktan kaldırır"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "bir anahtarı imzalar"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "anahtarları gönderir"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "anahtarları bir anahtar sunucusundan indirir"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "bir anahtar sunucusunda anahtarları arar"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan günceller"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "anahtarları indirir/katıştırır"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "kart durumunu basar"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "kart üzerindeki veriyi değiştirir"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "bir kartın PIN'ini değiştirir"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "güvence veritabanını günceller"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
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
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1863,48 +1866,47 @@ msgstr ""
"Seçenekler:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|İSİM|İSİM için şifreleme yapar"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
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:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "üzerine yazmadan önce sorar"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "kesin OpenPGP davranışı etkin olur"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "PGP 2.x uyumlu iletiler üretilir"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1912,7 +1914,7 @@ msgstr ""
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1932,17 +1934,17 @@ msgstr ""
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Yazılım hatalarını lütfen <[email protected]> adresine,\n"
"çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1952,7 +1954,7 @@ msgstr ""
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1960,576 +1962,577 @@ msgstr ""
"\n"
"Desteklenen algoritmalar:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "GenAnah: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "Şifre: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "Sıkıştırma: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "kullanımı: gpg [seçenekler] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "grup tanımı '%s' içinde = işareti yok\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
"kullanıcı kimlikleri gösterilir"
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr ""
"anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
"yardımcı anahtarlar gösterilir"
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "anahtar listelerinde anahtarlık ismini gösterir"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "BİLGİ: %s normal kullanım için değil!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
"gösterilir"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
"kimlikleri gösterilir"
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr ""
"imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
"kimlikleri gösterilir"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr "imzaları PKA verisi ile doğrular"
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özümleme algoritması geçersiz\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "kişisel özümleme tercihleri geçersiz\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [dosyaismi]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--s2k-mode 0 ile --symmetric --encrypt kullanamazsınız\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s kipindeyken --symmetric --encrypt kullanamazsınız\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [dosyaismi]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key kullanıcı-kimliği"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key kullanıcı-kimliği"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullanıcı-kimliği [komutlar]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "`%s' çittirim algoritması geçersiz\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[dosyaismi]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "anahtarlar bu anahtarlıktan alınır"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6377,76 +6380,76 @@ msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
msgid "can't open fd %d: %s\n"
msgstr "`%s' açılamıyor: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "Yönetici komutlarına izin verilmez\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "`%s' için okuma hatası: %s\n"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "satır çok uzun"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
msgid "missing argument"
msgstr ""
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "Yöneticiye özel komut\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "liste seçenekleri geçersiz\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "[Hata - nüve dışında]"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "liste seçenekleri geçersiz\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, fuzzy, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr "\"%s\" seçeneği bir program ve seçimlik argümanlar gerektirir\n"
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, fuzzy, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "[Hata - nüve dışında]"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "liste seçenekleri geçersiz\n"
@@ -6781,7 +6784,7 @@ msgstr "|N|Yeni PIN"
msgid "run in multi server mode (foreground)"
msgstr "çoklu sunucu kipinde çalışır (önalanda)"
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
msgid "read options from file"
msgstr "seçenekler dosyadan okunur"
@@ -7390,178 +7393,140 @@ msgstr "\"%s\" sertifikası silinemedi: %s\n"
msgid "no valid recipients given\n"
msgstr "geçerli alıcılar verilmedi\n"
-#: sm/gpgsm.c:248
-msgid "|[FILE]|make a signature"
-msgstr "|[DOSYA]|bir imza yapar"
-
-#: sm/gpgsm.c:249
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[DOSYA]|açıkça okunabilen bir imza yapar"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
msgid "list external keys"
msgstr "harici anahtarları listeler"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
msgid "list certificate chain"
msgstr "sertifika zincirini listeler"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
msgid "import certificates"
msgstr "sertifikaları ithal eder"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
msgid "export certificates"
msgstr "sertifikaları ihraç eder"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr "bir akıllı kartı kayda alır"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr "dirmngr'a bir komut aktarır"
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr "gpg-protect-tool'u çalıştırır"
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
msgid "change a passphrase"
msgstr "anahtar parolası değiştirir"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
msgid "create base-64 encoded output"
msgstr "base-64 kodlu çıktı oluşturur"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr "girdinin PEM biçiminde olduğu kabul edilir"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr "girdinin ikilik biçimde olduğu kabul edilir"
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr "elverişliyse sistemin dirmngr'ı kullanılır"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr "asla bir CRL sormaz"
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr "doğruluğu OCSP kullarak sınar"
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr "|N|içerilecek sertifika sayısı"
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr "sertifika poliçeleri sınanmaz"
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr "kayıp sertifikacı sertifikalarını alır"
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "terminali hiç kullanma"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
#, fuzzy
msgid "|FILE|write a server mode log to FILE"
msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "v3 imzalarına zorlar"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "şifreleme için daima bir MDC kullanılır"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "soruların çoğunda cevap evet farzedilir"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "soruların çoğunda cevap hayır farzedilir"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "bu anahtarlığı anahtarlık listesine ekler"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "bu gizli anahtarlığı listeye ekler"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7571,59 +7536,59 @@ msgstr ""
"imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
msgid "usage: gpgsm [options] "
msgstr "kullanımı: gpgsm [seçenekler] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "`%s'e şifrelenemez: %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "`%s' seçeneği bilinmiyor\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%d. satır: konu ismi belirtilmemiş\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " a = bu anahtarı atla\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "`%s' kullanarak imzalanamıyor: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr "bu komut henüz gerçeklenmedi\n"
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7958,6 +7923,10 @@ msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
msgid "do not allow the reuse of old passphrases"
msgstr "anahtar parolasının önceden atanmasına izin verilir"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8289,6 +8258,39 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "PGP 2.x uyumlu iletiler üretilir"
+
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[DOSYA]|bir imza yapar"
+
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[DOSYA]|açıkça okunabilen bir imza yapar"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "v3 imzalarına zorlar"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "şifreleme için daima bir MDC kullanılır"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "bu gizli anahtarlığı listeye ekler"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
+
#~ msgid "remove key from the public keyring"
#~ msgstr "anahtarları genel anahtarlıktan kaldırır"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d9ff867ce..248c6c4e3 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -98,7 +98,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -108,12 +108,12 @@ msgstr "无法建立‘%s’:%s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’: %s\n"
@@ -307,14 +307,14 @@ msgstr ""
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "详细模式"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
@@ -326,7 +326,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
@@ -396,7 +396,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -415,30 +415,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
@@ -1427,7 +1427,7 @@ msgstr "无效的指令(尝试“help”)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
@@ -1723,7 +1723,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1731,35 +1731,37 @@ msgstr ""
"@指令:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "生成一份分离的签名"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "验证签名"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "列出密钥"
@@ -1771,11 +1773,11 @@ msgstr "列出密钥和签名"
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "列出私钥"
@@ -1783,79 +1785,80 @@ msgstr "列出私钥"
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "为某把密钥添加签名"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1866,48 +1869,47 @@ msgstr ""
"选项:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "生成与 PGP 2.x 兼容的报文"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1915,7 +1917,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1935,17 +1937,17 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1955,7 +1957,7 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1963,564 +1965,565 @@ msgstr ""
"\n"
"支持的算法:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "对称加密:"
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "散列:"
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "压缩:"
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d:无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签名和加密\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "从这个钥匙环里取用密钥"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "把时间戳矛盾仅视为警告"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|FD|把状态信息写入文件描述符 FD"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "用法:gpgv [选项] [文件] (用 -h 求助)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6224,77 +6227,77 @@ msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
msgid "can't open fd %d: %s\n"
msgstr "无法打开‘%s’: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
#, fuzzy
msgid "argument not expected"
msgstr "不允许使用管理员命令\n"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
#, fuzzy
msgid "read error"
msgstr "文件读取错误"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
#, fuzzy
msgid "keyword too long"
msgstr "列太长"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
#, fuzzy
msgid "missing argument"
msgstr "无效的参数"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
#, fuzzy
msgid "invalid command"
msgstr "仅供管理员使用的命令\n"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
#, fuzzy
msgid "invalid alias definition"
msgstr "无效的列表选项\n"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "可选"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
#, fuzzy
msgid "invalid option"
msgstr "无效的列表选项\n"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "无效的指令(尝试“help”)\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "可选"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "无效的列表选项\n"
@@ -6629,7 +6632,7 @@ msgstr "新的 PIN"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
#, fuzzy
msgid "read options from file"
msgstr "从‘%s’读取选项\n"
@@ -7247,194 +7250,147 @@ msgstr "删除密钥区块时失败:%s\n"
msgid "no valid recipients given\n"
msgstr "(不给定描述)\n"
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[文件名]|生成一份签名"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[文件名]|生成一份明文签名"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "列出私钥"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "证书已损坏"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "证书已损坏"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "证书已损坏"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
#, fuzzy
msgid "register a smartcard"
msgstr "在智能卡上添加一把密钥"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "输出经 ASCII 封装"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr ""
-
-#: sm/gpgsm.c:329
-#, fuzzy
-msgid "use the default key as default recipient"
-msgstr "已跳过:公钥已被设为默认收件者\n"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "从‘%s’读取选项\n"
-#: sm/gpgsm.c:351
-#, fuzzy
-msgid "force v3 signatures"
-msgstr "检查签名"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr ""
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:361
+#: sm/gpgsm.c:297
#, fuzzy
-msgid "add this keyring to the list of keyrings"
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "从这个钥匙环里取用密钥"
-#: sm/gpgsm.c:362
-#, fuzzy
-msgid "add this secret keyring to the list"
-msgstr "要有私钥才能这么做。\n"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:365
-#, fuzzy
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|某甲|为收件者“某甲”加密"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr ""
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "未知的对称加密算法"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s 签名,散列算法 %s\n"
-#: sm/gpgsm.c:395
-#, fuzzy
-msgid "|N|use compress algorithm N"
-msgstr "未知的压缩算法"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7445,60 +7401,60 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "用法:gpg [选项] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "未知的选项 '%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(不给定描述)\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳过这把密钥\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存取‘%s’:%s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7827,6 +7783,10 @@ msgstr "从导出的子钥中删除所有密码"
msgid "do not allow the reuse of old passphrases"
msgstr "生成密码的时候发生错误:%s\n"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
@@ -8159,6 +8119,37 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "生成与 PGP 2.x 兼容的报文"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[文件名]|生成一份签名"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[文件名]|生成一份明文签名"
+
+#, fuzzy
+#~ msgid "use the default key as default recipient"
+#~ msgstr "已跳过:公钥已被设为默认收件者\n"
+
+#, fuzzy
+#~ msgid "force v3 signatures"
+#~ msgstr "检查签名"
+
+#, fuzzy
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "要有私钥才能这么做。\n"
+
+#, fuzzy
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|某甲|为收件者“某甲”加密"
+
+#, fuzzy
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "未知的压缩算法"
+
#, fuzzy
#~ msgid "remove key from the public keyring"
#~ msgstr "从公钥钥匙环里删除密钥"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b6b05f259..fcd2273cd 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: [email protected]\n"
-"POT-Creation-Date: 2008-11-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+0100\n"
"PO-Revision-Date: 2008-03-26 22:35+0800\n"
"Last-Translator: Jedi Lin <[email protected]>\n"
"Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -94,7 +94,7 @@ 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:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
@@ -104,12 +104,12 @@ msgstr "無法建立 `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: 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:2711
+#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
+#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "無法開啟 `%s': %s\n"
@@ -296,14 +296,14 @@ msgstr "以伺服器模式執行 (前景)"
msgid "run in daemon mode (background)"
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
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "囉唆模式"
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "盡量安靜些"
@@ -315,7 +315,7 @@ msgstr "sh 樣式的指令輸出"
msgid "csh-style command output"
msgstr "csh 樣式的指令輸出"
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
msgid "|FILE|read options from FILE"
msgstr "|檔案|從「檔案」中讀取選項"
@@ -380,7 +380,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr "|檔案|將環境設定也寫至「檔案」"
#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <"
msgstr "翻譯瑕疵請回報給 <[email protected]>, 程式瑕疵則請回報給 <"
@@ -397,30 +397,30 @@ msgstr ""
"語法: gpg-agent [選項] [指令 [引數]]\n"
"GnuPG 私鑰管理\n"
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "給定的除錯等級 `%s' 無效\n"
#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:631 g10/gpg.c:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "請注意: 沒有預設選項檔 `%s'\n"
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
+#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "選項檔 `%s': %s\n"
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
#, c-format
msgid "reading options from `%s'\n"
msgstr "從 `%s' 讀取選項中\n"
@@ -1381,7 +1381,7 @@ msgstr "無效的指令 (試試看 \"help\")\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在這個指令中沒有作用\n"
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "無法開啟 `%s'\n"
@@ -1677,7 +1677,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:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
msgid ""
"@Commands:\n"
" "
@@ -1685,35 +1685,37 @@ msgstr ""
"@指令:\n"
" "
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
msgstr "|[檔案]|建立簽章"
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
msgstr "|[檔案]|建立明文簽章"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
msgid "make a detached signature"
msgstr "建立分離式簽章"
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
msgid "encrypt data"
msgstr "加密資料"
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encryption only with symmetric cipher"
msgstr "僅使用對稱式編密法來加密"
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "decrypt data (default)"
msgstr "資料解密 (預設)"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "verify a signature"
msgstr "驗證簽章"
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
msgid "list keys"
msgstr "列出金鑰"
@@ -1725,11 +1727,11 @@ msgstr "列出金鑰和簽章"
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "列出私鑰"
@@ -1737,79 +1739,80 @@ msgstr "列出私鑰"
msgid "generate a new key pair"
msgstr "產生新的金鑰對"
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "從公鑰鑰匙圈裡移除金鑰"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the secret keyring"
msgstr "從私鑰鑰匙圈裡移除金鑰"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "sign a key"
msgstr "簽署金鑰"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "sign a key locally"
msgstr "僅在本機簽署金鑰"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign or edit a key"
msgstr "簽署或編輯金鑰"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a revocation certificate"
msgstr "產生撤銷憑證"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "export keys"
msgstr "匯出金鑰"
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "把金鑰匯出至金鑰伺服器"
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "從金鑰伺服器匯入金鑰"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "search for keys on a key server"
msgstr "在金鑰伺服器上搜尋金鑰"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "update all keys from a keyserver"
msgstr "從金鑰伺服器更新所有的金鑰"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "匯入/合併金鑰"
-#: g10/gpg.c:412
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "列印卡片狀態"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "變更卡片上的資料"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "變更卡片的 PIN"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "更新信任資料庫"
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
msgstr "|演算法 [檔案]|印出訊息摘要"
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
msgid "run in server mode"
msgstr "以伺服器模式執行"
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -1820,47 +1823,46 @@ msgstr ""
"選項:\n"
" "
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "建立以 ASCII 封裝過的輸出"
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
msgstr "|名字|以「名字」作為加密對象"
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "拿這個使用者 ID 來簽署或解密"
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
msgid "use canonical text mode"
msgstr "使用標準的文字模式"
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至「檔案」"
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
msgid "do not make any changes"
msgstr "不要做任何改變"
-#: g10/gpg.c:484
+#: g10/gpg.c:497
msgid "prompt before overwriting"
msgstr "覆寫前先詢問"
-#: g10/gpg.c:527
+#: g10/gpg.c:549
msgid "use strict OpenPGP behavior"
msgstr "使用嚴謹的 OpenPGP 行為"
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "產生 PGP 2.x 相容性訊息"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1868,7 +1870,7 @@ msgstr ""
"@\n"
"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
msgid ""
"@\n"
"Examples:\n"
@@ -1888,16 +1890,16 @@ msgstr ""
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"請向 <[email protected]> 回報程式瑕疵, 向 <[email protected]> 回報翻譯瑕疵.\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:807
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
-#: g10/gpg.c:780
+#: g10/gpg.c:810
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1907,7 +1909,7 @@ msgstr ""
"簽署, 檢查, 加密或解密\n"
"預設的操作會依輸入資料而定\n"
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1915,563 +1917,564 @@ msgstr ""
"\n"
"已支援的演算法:\n"
-#: g10/gpg.c:794
+#: g10/gpg.c:824
msgid "Pubkey: "
msgstr "公鑰: "
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
msgid "Cipher: "
msgstr "編密法: "
-#: g10/gpg.c:808
+#: g10/gpg.c:838
msgid "Hash: "
msgstr "雜湊: "
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
msgid "Compression: "
msgstr "壓縮: "
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
msgid "Used libraries:"
msgstr "已使用的函示庫:"
-#: g10/gpg.c:930
+#: g10/gpg.c:960
msgid "usage: gpg [options] "
msgstr "用法: gpg [選項] "
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的組態項目 `%s'\n"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
msgid "display photo IDs during key listings"
msgstr "列出金鑰時顯示照片 ID"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
msgid "show policy URLs during signature listings"
msgstr "列出簽章時顯示原則 URL"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
msgid "show all notations during signature listings"
msgstr "列出簽章時顯示所有的註記"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
msgid "show IETF standard notations during signature listings"
msgstr "列出簽章時顯示 IETF 標準註記"
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
msgid "show user-supplied notations during signature listings"
msgstr "列出簽章時顯示使用者提供的註記"
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
msgid "show user ID validity during key listings"
msgstr "列出金鑰時顯示使用者 ID 有效性"
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
msgid "show revoked and expired user IDs in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
msgid "show revoked and expired subkeys in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
msgid "show the keyring name in key listings"
msgstr "在金鑰清單中顯示鑰匙圈名稱"
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
msgid "show expiration dates during signature listings"
msgstr "列出簽章時顯示有效期限"
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不會用到 %s!\n"
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' 不是個有效的簽章使用期限\n"
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' 不是個有效的字元集\n"
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URL\n"
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
msgid "display photo IDs during signature verification"
msgstr "驗證簽章時顯示照片 ID"
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
msgid "show policy URLs during signature verification"
msgstr "驗證簽章時顯示原則 URL"
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
msgid "show all notations during signature verification"
msgstr "驗證簽章時顯示所有的註記"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
msgid "show IETF standard notations during signature verification"
msgstr "驗證簽章時顯示 IETF 標準註記"
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
msgid "show user-supplied notations during signature verification"
msgstr "驗證簽章時顯示使用者提供的註記"
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
msgid "show preferred keyserver URLs during signature verification"
msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
msgid "show user ID validity during signature verification"
msgstr "驗證簽章時顯示使用者 ID 有效性"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
msgid "show revoked and expired user IDs in signature verification"
msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
msgid "show only the primary user ID in signature verification"
msgstr "驗證簽章時祇顯示主要的使用者 ID"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
msgid "validate signatures with PKA data"
msgstr "以 PKA 資料驗證簽章"
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提高對持有有效 PKA 資料之簽章的信任"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的自動金鑰定址清單\n"
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會推翻 %s\n"
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不允許跟 %s 併用!\n"
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "你祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "你在 --pgp2 模式下時, 不能同時簽署和加密\n"
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3176
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "你不該將 `%s' 編密演算法用於 %s 模式中\n"
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "你不該將 `%s' 摘要演算法用於 %s 模式中\n"
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "你不該將 `%s' 壓縮演算法用於 %s 模式中\n"
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
msgid "--store [filename]"
msgstr "--store [檔名]"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
msgid "--symmetric [filename]"
msgstr "--symmetric [檔名]"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "`%s' 對稱式加密失敗: %s\n"
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
msgid "--encrypt [filename]"
msgstr "--encrypt [檔名]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [檔名]"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
msgid "--sign [filename]"
msgstr "--sign [檔名]"
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [檔名]"
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [檔名]"
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [檔名]"
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
msgid "--clearsign [filename]"
msgstr "--clearsign [檔名]"
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
msgid "--decrypt [filename]"
msgstr "--decrypt [檔名]"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
msgid "--sign-key user-id"
msgstr "--sign-key 使用者ID"
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
msgid "--lsign-key user-id"
msgstr "--lsign-key 使用者ID"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 使用者ID [指令]"
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器失敗: %s\n"
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收失敗: %s\n"
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "用金鑰伺服器搜尋失敗: %s\n"
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新失敗: %s\n"
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "無效的 `%s' 雜湊演算法\n"
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
msgid "[filename]"
msgstr "[檔名]"
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
msgid "Go ahead and type your message ...\n"
msgstr "請開始輸入你的訊息 ...\n"
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
msgstr "從這個鑰匙圈裡取用金鑰"
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
msgid "make timestamp conflicts only a warning"
msgstr "僅把時間戳印矛盾視為警告"
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
msgid "|FD|write status info to this FD"
msgstr "|檔案描述|把狀態資訊寫入此「檔案描述」"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -6185,70 +6188,70 @@ msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
msgid "can't open fd %d: %s\n"
msgstr "無法開啟 fd %d: %s\n"
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
msgid "argument not expected"
msgstr "沒料到有引數"
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
msgid "read error"
msgstr "讀取錯誤"
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
msgid "keyword too long"
msgstr "關鍵字太長"
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
msgid "missing argument"
msgstr "無效的引數"
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
msgid "invalid command"
msgstr "無效的指令"
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
msgid "invalid alias definition"
msgstr "無效的別名定義"
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
#, fuzzy
msgid "out of core"
msgstr "[錯誤 - 超出核心]"
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
msgid "invalid option"
msgstr "無效的選項"
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr "\"%.50s\" 選項遺失了引數\n"
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr "\"%.50s\" 選項沒料到會有引數\n"
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
#, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "無效的指令 \"%.50s\"\n"
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" 選項不明確\n"
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr "\"%.50s\" 指令不明確\n"
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
#, fuzzy
msgid "out of core\n"
msgstr "[錯誤 - 超出核心]"
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
#, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "無效的選項 \"%.50s\"\n"
@@ -6580,7 +6583,7 @@ msgstr "|N|新增 PIN"
msgid "run in multi server mode (foreground)"
msgstr "以多重伺服器模式執行 (前景)"
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
msgid "read options from file"
msgstr "從檔案中讀取選項"
@@ -7166,176 +7169,138 @@ msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
msgid "no valid recipients given\n"
msgstr "沒有給定有效的收件者\n"
-#: sm/gpgsm.c:248
-msgid "|[FILE]|make a signature"
-msgstr "|[檔案]|做出簽章"
-
-#: sm/gpgsm.c:249
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[檔案]|做出明文簽章"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
msgid "list external keys"
msgstr "列出外部金鑰"
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
msgid "list certificate chain"
msgstr "列出憑證鏈"
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
msgid "import certificates"
msgstr "匯入憑證"
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
msgid "export certificates"
msgstr "匯出憑證"
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
msgid "register a smartcard"
msgstr "註冊智慧卡"
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr "將指令遞送給 dirmngr"
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr "叫用 gpg-protect-tool"
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
msgid "change a passphrase"
msgstr "更改密語"
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
msgid "create base-64 encoded output"
msgstr "建立以 base-64 編碼過的輸出"
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr "假設輸入的是 PEM 格式"
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr "假設輸入的是 base-64 格式"
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr "假設輸入的是二進制格式"
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr "如果系統有 dirmngr 的話就拿來用"
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr "永遠不要查閱 CRL"
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr "用 OCSP 檢查有效性"
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr "|N|要包含的憑證數量"
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr "|檔案|從「檔案」中取得原則資訊"
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr "不要檢查憑證原則"
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr "取回遺失的發行者憑證"
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr "|名字|使用「名字」做為預設收件者"
-
-#: sm/gpgsm.c:329
-msgid "use the default key as default recipient"
-msgstr "使用預設的金鑰做為預設的收件者"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr "完全不要使用終端機"
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr "|檔案|將伺服器模式日誌寫入至「檔案」"
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
msgid "|FILE|write an audit log to FILE"
msgstr "|檔案|將稽核日誌寫入至「檔案」"
-#: sm/gpgsm.c:351
-msgid "force v3 signatures"
-msgstr "強迫使用第三版簽章"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr "總是使用 MDC 來加密"
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
msgid "batch mode: never ask"
msgstr "批次模式: 永遠不詢問"
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
msgid "assume yes on most questions"
msgstr "假設大部分的問題都回答是"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
msgid "assume no on most questions"
msgstr "假設大部分的問題都回答否"
-#: sm/gpgsm.c:361
-msgid "add this keyring to the list of keyrings"
+#: sm/gpgsm.c:297
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
msgstr "將此金鑰鑰匙圈加到金鑰鑰匙圈清單中"
-#: sm/gpgsm.c:362
-msgid "add this secret keyring to the list"
-msgstr "將此私鑰鑰匙圈加到清單中"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
msgstr "|名字|使用「名字」做為預設私鑰"
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
#, fuzzy
msgid "|SPEC|use this keyserver to lookup keys"
msgstr "|主機|使用此金鑰伺服器來查找金鑰"
-#: sm/gpgsm.c:365
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|名稱|將終端機字元集設為「名稱」"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|等級|設定除錯等級為「等級」"
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr "|檔案|載入延伸模組「檔案」"
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
msgid "|NAME|use cipher algorithm NAME"
msgstr "|名稱|使用「名稱」編密演算法"
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
msgid "|NAME|use message digest algorithm NAME"
msgstr "|名稱|使用「名稱」訊息摘要演算法"
-#: sm/gpgsm.c:395
-msgid "|N|use compress algorithm N"
-msgstr "|N|使用壓縮演算法 N"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "用法: gpgsm [選項] [檔案] (或用 -h 求助)"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
msgid ""
"Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7345,59 +7310,59 @@ msgstr ""
"用 S/MIME 協定來簽署, 檢查, 加密或解密\n"
"預設的操作會依輸入資料而定\n"
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
msgid "usage: gpgsm [options] "
msgstr "用法: gpgsm [選項] "
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
#, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "請注意: 將無法加密為 `%s': %s\n"
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
#, c-format
msgid "unknown validation model `%s'\n"
msgstr "未知的驗證模型 `%s'\n"
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "第 %d 列: 沒有給定的物件名稱\n"
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳過這把金鑰\n"
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "無法剖析金鑰伺服器 URL\n"
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
#, c-format
msgid "importing common certificates `%s'\n"
msgstr "正在匯入通用憑證 `%s'\n"
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
#, c-format
msgid "can't sign using `%s': %s\n"
msgstr "無法用 `%s' 來簽署: %s\n"
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
msgid "this command has not yet been implemented\n"
msgstr "這個指令尚未實做完成\n"
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7724,6 +7689,10 @@ msgstr "|N|在 N 天之後讓密語過期"
msgid "do not allow the reuse of old passphrases"
msgstr "不允許重複使用舊密語"
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr "|名字|使用「名字」做為預設私鑰"
+
#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|名字|也加密給使用者 ID「名字」"
@@ -8050,6 +8019,39 @@ msgstr ""
"語法: gpg-check-pattern [選項] 樣式檔案\n"
"用樣式檔案來檢查由標準輸入給定的密語\n"
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "產生 PGP 2.x 相容性訊息"
+
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[檔案]|做出簽章"
+
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[檔案]|做出明文簽章"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|名字|使用「名字」做為預設收件者"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "使用預設的金鑰做為預設的收件者"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "強迫使用第三版簽章"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "總是使用 MDC 來加密"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "將此私鑰鑰匙圈加到清單中"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|名稱|將終端機字元集設為「名稱」"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|檔案|載入延伸模組「檔案」"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|使用壓縮演算法 N"
+
#~ msgid "remove key from the public keyring"
#~ msgstr "從公鑰鑰匙圈裡移除金鑰"
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 749bc58ae..6b9a5c327 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-13 Werner Koch <[email protected]>
+
+ * gpgsm.c: Remove all unused options. Use ARGPARSE macros.
+
2008-10-28 Werner Koch <[email protected]>
* certdump.c (gpgsm_format_keydesc): Use xtryasprintf and xfree.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index f9034328d..eebe2c1a5 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -50,7 +50,6 @@ enum cmd_and_opt_values {
aSym = 'c',
aDecrypt = 'd',
aEncr = 'e',
- oInteractive = 'i',
aListKeys = 'k',
aListSecretKeys = 'K',
oDryRun = 'n',
@@ -58,20 +57,12 @@ enum cmd_and_opt_values {
oQuiet = 'q',
oRecipient = 'r',
aSign = 's',
- oTextmodeShort= 't',
oUser = 'u',
oVerbose = 'v',
- oCompress = 'z',
- oNotation = 'N',
oBatch = 500,
aClearsign,
- aStore,
aKeygen,
aSignEncr,
- aSignKey,
- aLSignKey,
- aListPackets,
- aEditKey,
aDeleteKey,
aImport,
aVerify,
@@ -82,7 +73,6 @@ enum cmd_and_opt_values {
aRecvKeys,
aExport,
aExportSecretKeyP12,
- aCheckKeys, /* nyi */
aServer,
aLearnCard,
aCallDirmngr,
@@ -95,6 +85,7 @@ enum cmd_and_opt_values {
aDumpSecretKeys,
aDumpExternalKeys,
aKeydbClearSomeCertFlags,
+ aFingerprint,
oOptions,
oDebug,
@@ -150,35 +141,20 @@ enum cmd_and_opt_values {
oEnablePolicyChecks,
oAutoIssuerKeyRetrieve,
- oTextmode,
- oFingerprint,
oWithFingerprint,
oWithMD5Fingerprint,
oAnswerYes,
oAnswerNo,
oKeyring,
- oSecretKeyring,
oDefaultKey,
oDefRecipient,
oDefRecipientSelf,
oNoDefRecipient,
oStatusFD,
- oNoComment,
- oNoVersion,
- oEmitVersion,
- oCompletesNeeded,
- oMarginalsNeeded,
- oMaxCertDepth,
- oLoadExtension,
- oRFC1991,
- oOpenPGP,
oCipherAlgo,
oDigestAlgo,
oExtraDigestAlgo,
- oCompressAlgo,
- oCommandFD,
oNoVerbose,
- oTrustDBName,
oNoSecmemWarn,
oNoDefKeyring,
oNoGreeting,
@@ -191,284 +167,231 @@ enum cmd_and_opt_values {
oWithValidation,
oWithEphemeralKeys,
oSkipVerify,
- oCompressKeys,
- oCompressSigs,
- oAlwaysTrust,
- oRunAsShmCP,
- oSetFilename,
- oSetPolicyURL,
- oUseEmbeddedFilename,
oValidationModel,
- oComment,
- oDefaultComment,
- oThrowKeyid,
- oForceV3Sigs,
- oForceMDC,
- oS2KMode,
- oS2KDigest,
- oS2KCipher,
- oCharset,
- oNotDashEscaped,
- oEscapeFrom,
- oLockOnce,
- oLockMultiple,
- oLockNever,
oKeyServer,
oEncryptTo,
oNoEncryptTo,
oLoggerFD,
- oUtf8Strings,
- oNoUtf8Strings,
oDisableCipherAlgo,
oDisablePubkeyAlgo,
- oAllowNonSelfsignedUID,
- oAllowFreeformUID,
- oNoLiteral,
- oSetFilesize,
- oHonorHttpProxy,
- oFastListMode,
- oListOnly,
oIgnoreTimeConflict,
oNoRandomSeedFile,
- oNoAutoKeyRetrieve,
- oNoCommonCertsImport,
- oUseAgent,
- oMergeOnly,
- oTryAllSecrets,
- oTrustedKey,
- oEmuMDEncodeBug,
- aDummy
+ oNoCommonCertsImport
};
static ARGPARSE_OPTS opts[] = {
- { 300, NULL, 0, N_("@Commands:\n ") },
-
- { aSign, "sign", 256, N_("|[FILE]|make a signature")},
- { aClearsign, "clearsign", 256, N_("|[FILE]|make a clear text signature") },
- { aDetachedSign, "detach-sign", 256, N_("make a detached signature")},
- { aEncr, "encrypt", 256, N_("encrypt data")},
- { aSym, "symmetric", 256, N_("encryption only with symmetric cipher")},
- { aDecrypt, "decrypt", 256, N_("decrypt data (default)")},
- { aVerify, "verify" , 256, N_("verify a signature")},
- { aVerifyFiles, "verify-files" , 256, "@" },
- { aListKeys, "list-keys", 256, N_("list keys")},
- { aListExternalKeys, "list-external-keys", 256, N_("list external keys")},
- { aListSecretKeys, "list-secret-keys", 256, N_("list secret keys")},
- { aListChain, "list-chain", 256, N_("list certificate chain")},
- { oFingerprint, "fingerprint", 256, N_("list keys and fingerprints")},
- { aKeygen, "gen-key", 256, "@" },
- { aDeleteKey, "delete-keys",256,N_("remove keys from the public keyring")},
- { aSendKeys, "send-keys" , 256, N_("export keys to a key server") },
- { aRecvKeys, "recv-keys" , 256, N_("import keys from a key server") },
- { aImport, "import", 256 , N_("import certificates")},
- { aExport, "export", 256 , N_("export certificates")},
- { aLearnCard, "learn-card", 256 ,N_("register a smartcard")},
- { aServer, "server", 256, N_("run in server mode")},
- { aCallDirmngr, "call-dirmngr", 256, N_("pass a command to the dirmngr")},
- { aCallProtectTool, "call-protect-tool", 256,
- N_("invoke gpg-protect-tool")},
- { aPasswd, "passwd", 256, N_("change a passphrase")},
- { aGPGConfList, "gpgconf-list", 256, "@" },
- { aGPGConfTest, "gpgconf-test", 256, "@" },
-
- { aDumpKeys, "dump-cert", 256, "@"},
- { aDumpKeys, "dump-keys", 256, "@"},
- { aDumpChain, "dump-chain", 256, "@"},
- { aDumpExternalKeys, "dump-external-keys", 256, "@"},
- { aDumpSecretKeys, "dump-secret-keys", 256, "@"},
- { aKeydbClearSomeCertFlags, "keydb-clear-some-cert-flags", 256, "@"},
-
- { 301, NULL, 0, N_("@\nOptions:\n ") },
-
- { oArmor, "armor", 0, N_("create ascii armored output")},
- { oArmor, "armour", 0, "@" },
- { oBase64, "base64", 0, N_("create base-64 encoded output")},
-
- { oP12Charset, "p12-charset", 2, "@" },
-
- { oAssumeArmor, "assume-armor", 0, N_("assume input is in PEM format")},
- { oAssumeBase64, "assume-base64", 0,
- N_("assume input is in base-64 format")},
- { oAssumeBinary, "assume-binary", 0,
- N_("assume input is in binary format")},
-
- { oRecipient, "recipient", 2, N_("|NAME|encrypt for NAME")},
-
- { oPreferSystemDirmngr,"prefer-system-dirmngr", 0,
- N_("use system's dirmngr if available")},
- { oDisableCRLChecks, "disable-crl-checks", 0, N_("never consult a CRL")},
- { oEnableCRLChecks, "enable-crl-checks", 0, "@"},
- { oDisableTrustedCertCRLCheck, "disable-trusted-cert-crl-check", 0, "@"},
- { oEnableTrustedCertCRLCheck, "enable-trusted-cert-crl-check", 0, "@"},
- { oForceCRLRefresh, "force-crl-refresh", 0, "@"},
-
- { oDisableOCSP, "disable-ocsp", 0, "@" },
- { oEnableOCSP, "enable-ocsp", 0, N_("check validity using OCSP")},
-
- { oValidationModel, "validation-model", 2, "@"},
-
- { oIncludeCerts, "include-certs", 1,
- N_("|N|number of certificates to include") },
-
- { oPolicyFile, "policy-file", 2,
- N_("|FILE|take policy information from FILE") },
-
- { oDisablePolicyChecks, "disable-policy-checks", 0,
- N_("do not check certificate policies")},
- { oEnablePolicyChecks, "enable-policy-checks", 0, "@"},
-
- { oAutoIssuerKeyRetrieve, "auto-issuer-key-retrieve", 0,
- N_("fetch missing issuer certificates")},
-
-#if 0
- { oDefRecipient, "default-recipient" ,2,
- N_("|NAME|use NAME as default recipient")},
- { oDefRecipientSelf, "default-recipient-self" ,0,
- N_("use the default key as default recipient")},
- { oNoDefRecipient, "no-default-recipient", 0, "@" },
-#endif
- { oEncryptTo, "encrypt-to", 2, "@" },
- { oNoEncryptTo, "no-encrypt-to", 0, "@" },
-
- { oUser, "local-user",2, N_("use this user-id to sign or decrypt")},
-
-#if 0
- { oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") },
- { oTextmodeShort, NULL, 0, "@"},
- { oTextmode, "textmode", 0, N_("use canonical text mode")},
-#endif
-
- { oOutput, "output", 2, N_("|FILE|write output to FILE")},
- { oVerbose, "verbose", 0, N_("verbose") },
- { oQuiet, "quiet", 0, N_("be somewhat more quiet") },
- { oNoTTY, "no-tty", 0, N_("don't use the terminal at all") },
- { oLogFile, "log-file" ,2, N_("|FILE|write a server mode log to FILE")},
- { oNoLogFile, "no-log-file" ,0, "@"},
- { oAuditLog, "audit-log", 2, N_("|FILE|write an audit log to FILE")},
-#if 0
- { oForceV3Sigs, "force-v3-sigs", 0, N_("force v3 signatures") },
- { oForceMDC, "force-mdc", 0, N_("always use a MDC for encryption") },
-#endif
- { oDryRun, "dry-run", 0, N_("do not make any changes") },
- /*{ oInteractive, "interactive", 0, N_("prompt before overwriting") }, */
- /*{ oUseAgent, "use-agent",0, N_("use the gpg-agent")},*/
- { oBatch, "batch", 0, N_("batch mode: never ask")},
- { oAnswerYes, "yes", 0, N_("assume yes on most questions")},
- { oAnswerNo, "no", 0, N_("assume no on most questions")},
-
- { oKeyring, "keyring" ,2, N_("add this keyring to the list of keyrings")},
- { oSecretKeyring, "secret-keyring" ,2, N_("add this secret keyring to the list")},
- { oDefaultKey, "default-key" ,2, N_("|NAME|use NAME as default secret key")},
- { oKeyServer, "keyserver",2, N_("|SPEC|use this keyserver to lookup keys")},
- { oCharset, "charset" , 2, N_("|NAME|set terminal charset to NAME") },
- { oOptions, "options" , 2, N_("read options from file")},
-
- { oDebug, "debug" ,4|16, "@"},
- { oDebugLevel, "debug-level" ,2, N_("|LEVEL|set the debugging level to LEVEL")},
- { oDebugAll, "debug-all" ,0, "@"},
- { oDebugNone, "debug-none" ,0, "@"},
- { oDebugWait, "debug-wait" ,1, "@"},
- { oDebugAllowCoreDump, "debug-allow-core-dump", 0, "@" },
- { oDebugNoChainValidation, "debug-no-chain-validation", 0, "@"},
- { oDebugIgnoreExpiration, "debug-ignore-expiration", 0, "@"},
- { oFixedPassphrase, "fixed-passphrase", 2, "@"},
- { oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
- { aDummy, "no-comment", 0, "@"},
- { aDummy, "completes-needed", 1, "@"},
- { aDummy, "marginals-needed", 1, "@"},
- { oMaxCertDepth, "max-cert-depth", 1, "@" },
- { aDummy, "trusted-key", 2, "@"},
- { oLoadExtension, "load-extension" ,2,
- N_("|FILE|load extension module FILE")},
- { aDummy, "rfc1991", 0, "@"},
- { aDummy, "openpgp", 0, "@"},
- { aDummy, "s2k-mode", 1, "@"},
- { aDummy, "s2k-digest-algo",2, "@"},
- { aDummy, "s2k-cipher-algo",2, "@"},
- { oCipherAlgo, "cipher-algo", 2 , N_("|NAME|use cipher algorithm NAME")},
- { oDigestAlgo, "digest-algo", 2 ,
- N_("|NAME|use message digest algorithm NAME")},
- { oExtraDigestAlgo, "extra-digest-algo", 2 , "@" },
-#if 0
- { oCompressAlgo, "compress-algo", 1 , N_("|N|use compress algorithm N")},
-#endif
- { aDummy, "throw-keyid", 0, "@"},
- { aDummy, "notation-data", 2, "@"},
- { aExportSecretKeyP12, "export-secret-key-p12", 256, "@"},
+ ARGPARSE_group (300, N_("@Commands:\n ")),
+
+ ARGPARSE_c (aSign, "sign", N_("make a signature")),
+ ARGPARSE_c (aClearsign, "clearsign", N_("make a clear text signature") ),
+ ARGPARSE_c (aDetachedSign, "detach-sign", N_("make a detached signature")),
+ ARGPARSE_c (aEncr, "encrypt", N_("encrypt data")),
+ ARGPARSE_c (aSym, "symmetric", N_("encryption only with symmetric cipher")),
+ ARGPARSE_c (aDecrypt, "decrypt", N_("decrypt data (default)")),
+ ARGPARSE_c (aVerify, "verify", N_("verify a signature")),
+ ARGPARSE_c (aVerifyFiles, "verify-files", "@"),
+ ARGPARSE_c (aListKeys, "list-keys", N_("list keys")),
+ ARGPARSE_c (aListExternalKeys, "list-external-keys",
+ N_("list external keys")),
+ ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")),
+ ARGPARSE_c (aListChain, "list-chain", N_("list certificate chain")),
+ ARGPARSE_c (aFingerprint, "fingerprint", N_("list keys and fingerprints")),
+ ARGPARSE_c (aKeygen, "gen-key", "@"),
+ ARGPARSE_c (aDeleteKey, "delete-keys",
+ N_("remove keys from the public keyring")),
+ ARGPARSE_c (aSendKeys, "send-keys", N_("export keys to a key server")),
+ ARGPARSE_c (aRecvKeys, "recv-keys", N_("import keys from a key server")),
+ ARGPARSE_c (aImport, "import", N_("import certificates")),
+ ARGPARSE_c (aExport, "export", N_("export certificates")),
+ ARGPARSE_c (aExportSecretKeyP12, "export-secret-key-p12", "@"),
+ ARGPARSE_c (aLearnCard, "learn-card", N_("register a smartcard")),
+ ARGPARSE_c (aServer, "server", N_("run in server mode")),
+ ARGPARSE_c (aCallDirmngr, "call-dirmngr",
+ N_("pass a command to the dirmngr")),
+ ARGPARSE_c (aCallProtectTool, "call-protect-tool",
+ N_("invoke gpg-protect-tool")),
+ ARGPARSE_c (aPasswd, "passwd", N_("change a passphrase")),
+ ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
+ ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
+
+ ARGPARSE_c (aDumpKeys, "dump-cert", "@"),
+ ARGPARSE_c (aDumpKeys, "dump-keys", "@"),
+ ARGPARSE_c (aDumpChain, "dump-chain", "@"),
+ ARGPARSE_c (aDumpExternalKeys, "dump-external-keys", "@"),
+ ARGPARSE_c (aDumpSecretKeys, "dump-secret-keys", "@"),
+ ARGPARSE_c (aKeydbClearSomeCertFlags, "keydb-clear-some-cert-flags", "@"),
+
+ ARGPARSE_group (301, N_("@\nOptions:\n ")),
+
+ ARGPARSE_s_n (oArmor, "armor", N_("create ascii armored output")),
+ ARGPARSE_s_n (oArmor, "armour", "@"),
+ ARGPARSE_s_n (oBase64, "base64", N_("create base-64 encoded output")),
+
+ ARGPARSE_s_s (oP12Charset, "p12-charset", "@"),
+
+ ARGPARSE_s_n (oAssumeArmor, "assume-armor",
+ N_("assume input is in PEM format")),
+ ARGPARSE_s_n (oAssumeBase64, "assume-base64",
+ N_("assume input is in base-64 format")),
+ ARGPARSE_s_n (oAssumeBinary, "assume-binary",
+ N_("assume input is in binary format")),
+
+ ARGPARSE_s_s (oRecipient, "recipient", N_("|USER-ID|encrypt for USER-ID")),
+
+ ARGPARSE_s_n (oPreferSystemDirmngr,"prefer-system-dirmngr",
+ N_("use system's dirmngr if available")),
+
+ ARGPARSE_s_n (oDisableCRLChecks, "disable-crl-checks",
+ N_("never consult a CRL")),
+ ARGPARSE_s_n (oEnableCRLChecks, "enable-crl-checks", "@"),
+ ARGPARSE_s_n (oDisableTrustedCertCRLCheck,
+ "disable-trusted-cert-crl-check", "@"),
+ ARGPARSE_s_n (oEnableTrustedCertCRLCheck,
+ "enable-trusted-cert-crl-check", "@"),
+
+ ARGPARSE_s_n (oForceCRLRefresh, "force-crl-refresh", "@"),
+
+ ARGPARSE_s_n (oDisableOCSP, "disable-ocsp", "@"),
+ ARGPARSE_s_n (oEnableOCSP, "enable-ocsp", N_("check validity using OCSP")),
+
+ ARGPARSE_s_s (oValidationModel, "validation-model", "@"),
+
+ ARGPARSE_s_i (oIncludeCerts, "include-certs",
+ N_("|N|number of certificates to include") ),
+
+ ARGPARSE_s_s (oPolicyFile, "policy-file",
+ N_("|FILE|take policy information from FILE")),
+
+ ARGPARSE_s_n (oDisablePolicyChecks, "disable-policy-checks",
+ N_("do not check certificate policies")),
+ ARGPARSE_s_n (oEnablePolicyChecks, "enable-policy-checks", "@"),
+
+ ARGPARSE_s_n (oAutoIssuerKeyRetrieve, "auto-issuer-key-retrieve",
+ N_("fetch missing issuer certificates")),
+
+ ARGPARSE_s_s (oEncryptTo, "encrypt-to", "@"),
+ ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
+
+ ARGPARSE_s_s (oUser, "local-user",
+ N_("|USER-ID|use USER-ID to sign or decrypt")),
+
+ ARGPARSE_s_s (oOutput, "output", N_("|FILE|write output to FILE")),
+ ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
+ ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
+ ARGPARSE_s_n (oNoTTY, "no-tty", N_("don't use the terminal at all")),
+ ARGPARSE_s_s (oLogFile, "log-file",
+ N_("|FILE|write a server mode log to FILE")),
+ ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"),
+ ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
+
+ ARGPARSE_s_s (oAuditLog, "audit-log",
+ N_("|FILE|write an audit log to FILE")),
+ ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
+ ARGPARSE_s_n (oBatch, "batch", N_("batch mode: never ask")),
+ ARGPARSE_s_n (oAnswerYes, "yes", N_("assume yes on most questions")),
+ ARGPARSE_s_n (oAnswerNo, "no", N_("assume no on most questions")),
+
+ ARGPARSE_s_s (oKeyring, "keyring",
+ N_("|FILE|add keyring to the list of keyrings")),
+
+ ARGPARSE_s_s (oDefaultKey, "default-key",
+ N_("|USER-ID|use USER-ID as default secret key")),
+
+ /* Not yet used: */
+ /* ARGPARSE_s_s (oDefRecipient, "default-recipient", */
+ /* N_("|NAME|use NAME as default recipient")), */
+ /* ARGPARSE_s_n (oDefRecipientSelf, "default-recipient-self", */
+ /* N_("use the default key as default recipient")), */
+ /* ARGPARSE_s_n (oNoDefRecipient, "no-default-recipient", "@"), */
+
+ ARGPARSE_s_s (oKeyServer, "keyserver",
+ N_("|SPEC|use this keyserver to lookup keys")),
+ ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
+
+ ARGPARSE_p_u (oDebug, "debug", "@"),
+ ARGPARSE_s_s (oDebugLevel, "debug-level",
+ N_("|LEVEL|set the debugging level to LEVEL")),
+ ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
+ ARGPARSE_s_n (oDebugNone, "debug-none", "@"),
+ ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
+ ARGPARSE_s_n (oDebugAllowCoreDump, "debug-allow-core-dump", "@"),
+ ARGPARSE_s_n (oDebugNoChainValidation, "debug-no-chain-validation", "@"),
+ ARGPARSE_s_n (oDebugIgnoreExpiration, "debug-ignore-expiration", "@"),
+ ARGPARSE_s_s (oFixedPassphrase, "fixed-passphrase", "@"),
+
+ ARGPARSE_s_i (oStatusFD, "status-fd",
+ N_("|FD|write status info to this FD")),
+
+ ARGPARSE_s_s (oCipherAlgo, "cipher-algo",
+ N_("|NAME|use cipher algorithm NAME")),
+ ARGPARSE_s_s (oDigestAlgo, "digest-algo",
+ N_("|NAME|use message digest algorithm NAME")),
+ ARGPARSE_s_s (oExtraDigestAlgo, "extra-digest-algo", "@"),
- { 302, NULL, 0, N_(
+ ARGPARSE_group (302, N_(
"@\n(See the man page for a complete listing of all commands and options)\n"
- )},
+ )),
- { 303, NULL, 0, N_("@\nExamples:\n\n"
+ ARGPARSE_group (303, N_("@\nExamples:\n\n"
" -se -r Bob [file] sign and encrypt for user Bob\n"
" --clearsign [file] make a clear text signature\n"
" --detach-sign [file] make a detached signature\n"
" --list-keys [names] show keys\n"
- " --fingerprint [names] show fingerprints\n" ) },
-
- /* hidden options */
- { oNoVerbose, "no-verbose", 0, "@"},
-
- { oEnableSpecialFilenames, "enable-special-filenames", 0, "@" },
-
-
- { oTrustDBName, "trustdb-name", 2, "@" },
- { oNoSecmemWarn, "no-secmem-warning", 0, "@" },
- { oNoArmor, "no-armor", 0, "@"},
- { oNoArmor, "no-armour", 0, "@"},
- { oNoDefKeyring, "no-default-keyring", 0, "@" },
- { oNoGreeting, "no-greeting", 0, "@" },
- { oNoOptions, "no-options", 0, "@" }, /* shortcut for --options /dev/null */
- { oHomedir, "homedir", 2, "@" }, /* defaults to "~/.gnupg" */
- { oAgentProgram, "agent-program", 2 , "@" },
- { oDisplay, "display", 2, "@" },
- { oTTYname, "ttyname", 2, "@" },
- { oTTYtype, "ttytype", 2, "@" },
- { oLCctype, "lc-ctype", 2, "@" },
- { oLCmessages, "lc-messages", 2, "@" },
- { oXauthority, "xauthority", 2, "@" },
- { oDirmngrProgram, "dirmngr-program", 2 , "@" },
- { oDisableDirmngr, "disable-dirmngr", 0 , "@" },
- { oProtectToolProgram, "protect-tool-program", 2 , "@" },
- { oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */
-
- { oNoBatch, "no-batch", 0, "@" },
- { oWithColons, "with-colons", 0, "@"},
- { oWithKeyData,"with-key-data", 0, "@"},
- { oWithValidation, "with-validation", 0, "@"},
- { oWithMD5Fingerprint, "with-md5-fingerprint", 0, "@"},
- { oWithEphemeralKeys, "with-ephemeral-keys", 0, "@"},
- { aListKeys, "list-key", 256, "@" }, /* alias */
- { aListChain, "list-sig", 256, "@" }, /* alias */
- { aListChain, "list-sigs",256, "@" }, /* alias */
- { aListChain, "check-sig",256, "@" }, /* alias */
- { aListChain, "check-sigs",256, "@"}, /* alias */
- { aDeleteKey, "delete-key",256,"@"}, /* alias */
- { oSkipVerify, "skip-verify",0, "@" },
- { oCompressKeys, "compress-keys",0, "@"},
- { oCompressSigs, "compress-sigs",0, "@"},
- { oAlwaysTrust, "always-trust", 0, "@"},
- { oNoVersion, "no-version", 0, "@"},
- { oLockOnce, "lock-once", 0, "@" },
- { oLockMultiple, "lock-multiple", 0, "@" },
- { oLockNever, "lock-never", 0, "@" },
- { oLoggerFD, "logger-fd",1, "@" },
- { oWithFingerprint, "with-fingerprint", 0, "@" },
- { oDisableCipherAlgo, "disable-cipher-algo", 2, "@" },
- { oDisablePubkeyAlgo, "disable-pubkey-algo", 2, "@" },
- { oHonorHttpProxy,"honor-http-proxy", 0, "@" },
- { oListOnly, "list-only", 0, "@"},
- { oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" },
- { oNoRandomSeedFile, "no-random-seed-file", 0, "@" },
- { oNoCommonCertsImport, "no-common-certs-import", 0, "@" },
-{0} };
-
-
-
+ " --fingerprint [names] show fingerprints\n" )),
+
+ /* Hidden options. */
+ ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
+ ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
+ ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
+ ARGPARSE_s_n (oNoArmor, "no-armor", "@"),
+ ARGPARSE_s_n (oNoArmor, "no-armour", "@"),
+ ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
+ ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
+ ARGPARSE_s_n (oNoOptions, "no-options", "@"),
+ ARGPARSE_s_s (oHomedir, "homedir", "@"),
+ ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
+ ARGPARSE_s_s (oDisplay, "display", "@"),
+ ARGPARSE_s_s (oTTYname, "ttyname", "@"),
+ ARGPARSE_s_s (oTTYtype, "ttytype", "@"),
+ ARGPARSE_s_s (oLCctype, "lc-ctype", "@"),
+ ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
+ ARGPARSE_s_s (oXauthority, "xauthority", "@"),
+ ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
+ ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", "@"),
+ ARGPARSE_s_s (oProtectToolProgram, "protect-tool-program", "@"),
+ ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
+ ARGPARSE_s_n (oNoBatch, "no-batch", "@"),
+ ARGPARSE_s_n (oWithColons, "with-colons", "@"),
+ ARGPARSE_s_n (oWithKeyData,"with-key-data", "@"),
+ ARGPARSE_s_n (oWithValidation, "with-validation", "@"),
+ ARGPARSE_s_n (oWithMD5Fingerprint, "with-md5-fingerprint", "@"),
+ ARGPARSE_s_n (oWithEphemeralKeys, "with-ephemeral-keys", "@"),
+ ARGPARSE_s_n (oSkipVerify, "skip-verify", "@"),
+ ARGPARSE_s_n (oWithFingerprint, "with-fingerprint", "@"),
+ ARGPARSE_s_s (oDisableCipherAlgo, "disable-cipher-algo", "@"),
+ ARGPARSE_s_s (oDisablePubkeyAlgo, "disable-pubkey-algo", "@"),
+ ARGPARSE_s_n (oIgnoreTimeConflict, "ignore-time-conflict", "@"),
+ ARGPARSE_s_n (oNoRandomSeedFile, "no-random-seed-file", "@"),
+ ARGPARSE_s_n (oNoCommonCertsImport, "no-common-certs-import", "@"),
+
+ /* Command aliases. */
+ ARGPARSE_c (aListKeys, "list-key", "@"),
+ ARGPARSE_c (aListChain, "list-sig", "@"),
+ ARGPARSE_c (aListChain, "list-sigs", "@"),
+ ARGPARSE_c (aListChain, "check-sig", "@"),
+ ARGPARSE_c (aListChain, "check-sigs", "@"),
+ ARGPARSE_c (aDeleteKey, "delete-key", "@"),
+
+ ARGPARSE_end ()
+};
+
+
+
+
+/* Global variable to keep an error count. */
int gpgsm_errors_seen = 0;
/* It is possible that we are currentlu running under setuid permissions */
@@ -1123,7 +1046,6 @@ main ( int argc, char **argv)
do_not_setup_keys = 1;
break;
- case aCheckKeys:
case aImport:
case aSendKeys:
case aRecvKeys:
@@ -1287,7 +1209,7 @@ main ( int argc, char **argv)
opt.with_md5_fingerprint=1; /*fall thru*/
case oWithFingerprint:
with_fpr=1; /*fall thru*/
- case oFingerprint:
+ case aFingerprint:
opt.fingerprint++;
break;
@@ -1367,9 +1289,6 @@ main ( int argc, char **argv)
add_to_strlist ( &remusr, pargs.r.ret_str);
break;
- case oTextmodeShort: /*fixme:opt.textmode = 2;*/ break;
- case oTextmode: /*fixme:opt.textmode=1;*/ break;
-
case oUser: /* Store the local users, the first one is the default */
if (!opt.local_user)
opt.local_user = xstrdup (pargs.r.ret_str);
@@ -1397,6 +1316,10 @@ main ( int argc, char **argv)
}
break;
+ case oDigestAlgo:
+ /* Dummy for now. */
+ break;
+
case oExtraDigestAlgo:
extra_digest_algo = pargs.r.ret_str;
break;
@@ -1427,10 +1350,8 @@ main ( int argc, char **argv)
}
break;
- case aDummy:
- break;
default:
- pargs.err = configfp? 1:2;
+ pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
break;
}
}