summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2005-10-05 18:58:50 +0200
committerWerner Koch <wk@gnupg.org>2005-10-05 18:58:50 +0200
commitbd1df0119c26d14e298d11abdd07ae77e8fb124f (patch)
treeb536179161d11a20fd32df27971f65d952814a88
parent2005-10-02 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-bd1df0119c26d14e298d11abdd07ae77e8fb124f.tar.xz
gnupg2-bd1df0119c26d14e298d11abdd07ae77e8fb124f.zip
Renamed g10.c to gpg.c
Filelength fixes for W32.
-rw-r--r--g10/ChangeLog15
-rw-r--r--g10/encode.c10
-rw-r--r--g10/gpg.c (renamed from g10/g10.c)2
-rw-r--r--g10/photoid.c6
-rw-r--r--g10/progress.c2
-rw-r--r--g10/sign.c6
-rw-r--r--include/iobuf.h2
-rw-r--r--po/be.po199
-rw-r--r--po/ca.po199
-rw-r--r--po/cs.po199
-rw-r--r--po/da.po199
-rw-r--r--po/de.po215
-rw-r--r--po/el.po199
-rw-r--r--po/eo.po199
-rw-r--r--po/es.po199
-rw-r--r--po/et.po199
-rw-r--r--po/fi.po199
-rw-r--r--po/fr.po199
-rw-r--r--po/gl.po199
-rw-r--r--po/hu.po199
-rw-r--r--po/id.po199
-rw-r--r--po/it.po199
-rw-r--r--po/ja.po199
-rw-r--r--po/pl.po199
-rw-r--r--po/pt.po199
-rw-r--r--po/pt_BR.po199
-rw-r--r--po/ro.po199
-rw-r--r--po/ru.po199
-rw-r--r--po/sk.po199
-rw-r--r--po/sv.po199
-rw-r--r--po/tr.po199
-rw-r--r--po/zh_CN.po199
-rw-r--r--po/zh_TW.po199
-rw-r--r--util/ChangeLog6
-rw-r--r--util/fileutil.c3
-rw-r--r--util/iobuf.c55
36 files changed, 2749 insertions, 2548 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 875538b8d..c5992a0a0 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,18 @@
+2005-10-05 Werner Koch <wk@g10code.com>
+
+ * g10.c: Renamed to ..
+ * gpg.c: ..this.
+ * Makefile.am: Adjusted accordingly.
+
+2005-09-22 Werner Koch <wk@g10code.com>
+
+ * sign.c (write_plaintext_packet): Don't print an empty file
+ warning if the file is actually too large.
+ * encode.c (encode_simple,encode_crypt): Ditto.
+ * progress.c (handle_progress): Adjusted for iobuf_get_filelength
+ change.
+ * photoid.c (generate_photo_id): Ditto.
+
2005-09-20 Werner Koch <wk@g10code.com>
* mainproc.c (proc_symkey_enc): Take care of a canceled passphrase
diff --git a/g10/encode.c b/g10/encode.c
index a4906d62d..5bbe7cf53 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -299,8 +299,10 @@ encode_simple( const char *filename, int mode, int use_seskey )
if ( !iobuf_is_pipe_filename (filename) && *filename && !opt.textmode )
{
off_t tmpsize;
+ int overflow;
- if ( !(tmpsize = iobuf_get_filelength(inp)) )
+ if ( !(tmpsize = iobuf_get_filelength(inp, &overflow))
+ && !overflow )
log_info(_("WARNING: `%s' is an empty file\n"), filename );
/* We can't encode the length of very large files because
OpenPGP uses only 32 bit for file sizes. So if the the
@@ -589,14 +591,16 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey )
if (!iobuf_is_pipe_filename (filename) && *filename && !opt.textmode )
{
off_t tmpsize;
+ int overflow;
- if ( !(tmpsize = iobuf_get_filelength(inp)) )
+ if ( !(tmpsize = iobuf_get_filelength(inp, &overflow))
+ && !overflow )
log_info(_("WARNING: `%s' is an empty file\n"), filename );
/* We can't encode the length of very large files because
OpenPGP uses only 32 bit for file sizes. So if the the
size of a file is larger than 2^32 minus some bytes for
packet headers, we switch to partial length encoding. */
- if ( tmpsize < (IOBUF_FILELENGTH_LIMIT - 65536) )
+ if (tmpsize < (IOBUF_FILELENGTH_LIMIT - 65536) )
filesize = tmpsize;
else
filesize = 0;
diff --git a/g10/g10.c b/g10/gpg.c
index aaab93f7f..10eb24c41 100644
--- a/g10/g10.c
+++ b/g10/gpg.c
@@ -1,4 +1,4 @@
-/* g10.c - The GnuPG utility (main for gpg)
+/* gpg.c - The GnuPG utility (main for gpg)
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
* 2005 Free Software Foundation, Inc.
*
diff --git a/g10/photoid.c b/g10/photoid.c
index 885bbca01..d2a249167 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -53,6 +53,7 @@ generate_photo_id(PKT_public_key *pk,const char *photo_name)
byte *photo=NULL;
byte header[16];
IOBUF file;
+ int overflow;
header[0]=0x10; /* little side of photo header length */
header[1]=0; /* big side of photo header length */
@@ -119,8 +120,9 @@ generate_photo_id(PKT_public_key *pk,const char *photo_name)
continue;
}
- len=iobuf_get_filelength(file);
- if(len>6144)
+
+ len=iobuf_get_filelength(file, &overflow);
+ if(len>6144 || overflow)
{
tty_printf( _("This JPEG is really large (%d bytes) !\n"),len);
if(!cpr_get_answer_is_yes("photoid.jpeg.size",
diff --git a/g10/progress.c b/g10/progress.c
index a2141e4cb..8c8265f36 100644
--- a/g10/progress.c
+++ b/g10/progress.c
@@ -107,7 +107,7 @@ handle_progress (progress_filter_context_t *pfx, IOBUF inp, const char *name)
return;
if ( !iobuf_is_pipe_filename (name) && *name )
- filesize = iobuf_get_filelength (inp);
+ filesize = iobuf_get_filelength (inp, NULL);
else if (opt.set_filesize)
filesize = opt.set_filesize;
diff --git a/g10/sign.c b/g10/sign.c
index 0e8be714f..fd3c0ab45 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -561,8 +561,10 @@ write_plaintext_packet (IOBUF out, IOBUF inp, const char *fname, int ptmode)
if ( !iobuf_is_pipe_filename (fname) && *fname )
{
off_t tmpsize;
-
- if( !(tmpsize = iobuf_get_filelength(inp)) )
+ int overflow;
+
+ if( !(tmpsize = iobuf_get_filelength(inp, &overflow))
+ && !overflow )
log_info (_("WARNING: `%s' is an empty file\n"), fname);
/* We can't encode the length of very large files because
diff --git a/include/iobuf.h b/include/iobuf.h
index ae5da421c..b6e5303da 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -126,7 +126,7 @@ size_t iobuf_temp_to_buffer( IOBUF a, byte *buffer, size_t buflen );
void iobuf_unget_and_close_temp( IOBUF a, IOBUF temp );
int iobuf_get_fd (IOBUF a);
-off_t iobuf_get_filelength( IOBUF a );
+off_t iobuf_get_filelength (IOBUF a, int *overflow);
#define IOBUF_FILELENGTH_LIMIT 0xffffffff
const char *iobuf_get_real_fname( IOBUF a );
const char *iobuf_get_fname( IOBUF a );
diff --git a/po/be.po b/po/be.po
index cc7732333..1529a86c2 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -31,7 +31,7 @@ msgstr ""
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,8 +67,8 @@ msgstr ""
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -365,7 +365,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr ""
@@ -808,7 +808,7 @@ msgstr ""
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr ""
@@ -2639,20 +2639,20 @@ msgstr "збой падпісаньня: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr ""
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "сакрэтны ключ недаступны"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Ключ абаронены.\n"
@@ -2669,7 +2669,7 @@ msgstr ""
"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr ""
@@ -3089,12 +3089,12 @@ msgid ""
msgstr ""
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr ""
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr ""
@@ -3370,12 +3370,12 @@ msgstr ""
msgid "writing key binding signature\n"
msgstr ""
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr ""
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr ""
@@ -3465,7 +3465,7 @@ msgstr ""
msgid " (%d) RSA (set your own capabilities)\n"
msgstr ""
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr ""
@@ -3556,7 +3556,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr ""
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3566,44 +3566,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr ""
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr ""
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr ""
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr ""
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr ""
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr ""
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr ""
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr ""
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr ""
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3611,7 +3611,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -3626,34 +3626,34 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr ""
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3661,7 +3661,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3669,91 +3669,91 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr ""
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr ""
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "запіс у stdout\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr ""
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr ""
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr ""
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -4088,110 +4088,110 @@ msgstr ""
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr ""
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr ""
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr ""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
#, fuzzy
msgid "Key available at: "
msgstr "Даведка адсутнічае"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr ""
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr ""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr ""
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr ""
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr ""
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr ""
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
#, fuzzy
msgid "unknown"
msgstr "невядомая вэрсыя"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr ""
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr ""
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr ""
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr ""
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
@@ -4334,7 +4334,7 @@ msgstr ""
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -4611,87 +4611,92 @@ msgstr ""
msgid "Note: This key has been disabled.\n"
msgstr ""
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr ""
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr ""
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr ""
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr ""
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr ""
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr ""
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr ""
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr ""
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr ""
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr ""
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr ""
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index a4f620d0a..d7ea9d781 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -51,7 +51,7 @@ msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -88,8 +88,8 @@ msgstr "no s'ha pogut llegir «%s»: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -406,7 +406,7 @@ msgstr ""
# Destès? ivb
# Desatès, sí. jm
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
@@ -872,7 +872,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
@@ -2914,20 +2914,20 @@ msgstr "Ha fallat el procés de signatura: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Aquesta clau no està protegida.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "La clau està protegida.\n"
@@ -2944,7 +2944,7 @@ msgstr ""
"Introduïu la nova contrasenya per a la clau secreta.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
@@ -3411,13 +3411,13 @@ msgstr ""
"correcta a no ser que torneu a executar el programa.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[revocada]"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3721,12 +3721,12 @@ msgstr "s'està escrivint l'autosignatura\n"
msgid "writing key binding signature\n"
msgstr "s'està escrivint la signatura de comprovació de la clau\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -3817,7 +3817,7 @@ msgstr " (%d) RSA (només xifrar)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (només xifrar)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
@@ -3927,7 +3927,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "És correcte? (s/n)"
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3944,44 +3944,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nom i cognoms: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "El nom no pot començar amb un dígit\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Adreça electrònica: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "No és una adreça vàlida\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Comentari: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Esteu usant el joc de caràcters `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3992,7 +3992,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
@@ -4009,23 +4009,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoXx"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Corregiu l'error primer\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4033,12 +4033,12 @@ msgstr ""
"Cal una contrasenya per a protegir la clau secreta.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4050,7 +4050,7 @@ msgstr ""
"useu aquest programa amb l'opció \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4062,53 +4062,53 @@ msgstr ""
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "La generació de claus ha estat cancel·lada.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "s'està escrivint la clau pública a «%s»\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
# Potser no hi haja cap anell! ivb
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
"no s'ha trobat cap anell secret de escrivible: %s\n"
"\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "s'han creat i signat les claus pública i secreta.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4117,13 +4117,13 @@ msgstr ""
"Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
"\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
# Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4132,7 +4132,7 @@ msgstr ""
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4140,26 +4140,26 @@ msgstr ""
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -4506,110 +4506,110 @@ msgstr "nom del fitxer original='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "s'ha eliminat la verificació de signatura\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "no es poden tractar aquestes signatures múltiples\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# «%.*s» no serà una data? Caldrà «el» al davant. ivb
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "La clau és disponible en: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Signatura INCORRECTA de \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signatura caducada de \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signatura correcta de \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[incert]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Aquesta signatura caduca el %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binari"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "mode text"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "desconeguda"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "No s'ha pogut comprovar la signatura: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "no és una signatura separada\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signatura autònoma de classe 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "signatura de l'estil antic (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
@@ -4763,7 +4763,7 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquet de tipus %d té el bit crític activat\n"
@@ -5081,56 +5081,61 @@ msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Aquesta clau ha estat desactivada.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Nota: La clau ha caducat!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" No hi ha res que indique que la signatura pertany al seu propietari.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVÍS: La clau NO és de confiança!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Probablement la signatura és FALSA.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr "No és segur que la signatura pertanya al seu propietari.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: es descarta: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: es descarta: la clau pública ja està present\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5138,33 +5143,33 @@ msgstr ""
"\n"
"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Usuari inexistent.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "La clau pública està desactivada.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "es descarta: la clau pública ja està establida\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: es descarta: la clau pública està desactivada\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "no hi ha adreces vàlides\n"
diff --git a/po/cs.po b/po/cs.po
index 4631c74ea..51b010dbc 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-11-26 09:12+0200\n"
"Last-Translator: Roman Pavlik <rp@tns.cz>\n"
"Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -31,7 +31,7 @@ msgstr "nebyl detekovn dn modul pro zskn entropie\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,8 +67,8 @@ msgstr "nemohu st `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "poznmka: soubor random_seed nen aktualizovn\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -375,7 +375,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Nalezena OpenPGP karta slo %s\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "nelze provst v dvkovm mdu\n"
@@ -808,7 +808,7 @@ msgstr ""
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vydan symetrick ifra %s (%d) nevyhovuje pedvolbm pjemce\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "pouit %s nen v mdu %s dovoleno\n"
@@ -2802,19 +2802,19 @@ msgstr ""
"K dispozici je jen kontroln souet kle nebo je kl na kart - passphrase "
"nelze zmnit.\n"
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Tento kl nen chrnn.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn sti primrnho kle nejsou dostupn.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn st primrnho kle jsou uloeny na kart.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Kl je chrnn.\n"
@@ -2831,7 +2831,7 @@ msgstr ""
"Vlote nov heslo (passphrase) pro tento tajn kl.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nen zopakovno sprvn; zkuste to znovu"
@@ -3246,12 +3246,12 @@ msgstr ""
"bt nutn sprvn, dokud znova nespustte program.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "revokovn"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "platnost skonila"
@@ -3530,12 +3530,12 @@ msgstr "zapisuji podpis kle sebou samm\n"
msgid "writing key binding signature\n"
msgstr "zapisuji \"key-binding\" podpis\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn dlka kle; pouiji %u bit\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dlka kle zaokrouhlena na %u bit\n"
@@ -3624,7 +3624,7 @@ msgstr " (%d) RSA (pouze pro ifrovn)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nastavit si vlastn pouit)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Pr DSA kl DSA dlouh %u bit.\n"
@@ -3729,7 +3729,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Je to sprvn (a/N)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3745,44 +3745,44 @@ msgstr ""
" \"Magda Prochazkova (student) <magda@domena.cz>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Jmno a pjmen: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Neplatn znak ve jmn\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Jmno neme zanat slic\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Jmno mus bt dlouh alespo 5 znak\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "E-mailov adresa: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Neplatn e-mailov adresa\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Koment: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Neplatn znak v komenti\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pouvte znakovou sadu `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3793,7 +3793,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do pole jmno nebo koment nepite, prosm, e-mailovou adresu.\n"
@@ -3808,25 +3808,25 @@ msgstr "Do pole jmno nebo koment nepite, prosm, e-mailovou adresu.\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "jJkKeEPpUu"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmnit (J)mno, (K)oment, (E)-mail nebo (U)konit? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmnit (J)mno, (K)oment, (E)-mail, (P)okraovat dl nebo (U)konit "
"program? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Nejdv, prosm, opravte chybu\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3834,12 +3834,12 @@ msgstr ""
"Pro ochranu Vaeho tajnho kle muste zadat heslo.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3851,7 +3851,7 @@ msgstr ""
"tohoto programu s parametrem \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3864,50 +3864,50 @@ msgstr ""
"pouvat disky); dky tomu m genertor lep anci zskat dostatek "
"entropie.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Vytven kle bylo zrueno.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuji veejn kl do `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovateln soubor veejnch kl (pubring): %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenalezen zapisovateln soubor tajnch kl (secring): %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pi zpisu do souboru veejnch kl `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pi zpisu do souboru tajnch kl `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "veejn a tajn kl byly vytvoeny a podepsny.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -3915,12 +3915,12 @@ msgstr ""
"Tento kl neme bt pouit pro ifrovn. K vytvoen\n"
"sekundrnho kle pro tento el mete pout pkaz \"--edit-key\".\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoen kle se nepodailo: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -3928,7 +3928,7 @@ msgstr ""
"kl byl vytvoen %lu sekund v budoucnosti (dolo ke zmn asu nebo\n"
"je problm se systmovm asem)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3936,25 +3936,25 @@ msgstr ""
"kl byl vytvoen %lu sekund v budoucnosti (dolo ke zmn asu nebo\n"
"je problm se systmovm asem)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZNMKA: vytvoen podkle pro kle v3 nen v souladu s OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "Opravdu vytvoit? (a/N) "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "uloen kle na kartu se nezdailo: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nemohu vytvoit zlohu souboru `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "POZNMKA: zloha kle z karty uloena do `%s'\n"
@@ -4289,109 +4289,109 @@ msgstr ""
"samostatn revokan certifikt - pouijte \"gpg --import\", chcete-li jej "
"ut\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "verifikace podpisu potlaena\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "neumm pracovat s tmito nsobnmi podpisy\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "Podpis vytvoen %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " pouit %s kle %s\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu "ID" rein :-(
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpis vytvoen %s pomoc kle %s s ID uivatele %s\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Kl k dispozici na: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "PATN podpis od \"%s\""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vyprenou platnost od \"%s\""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "Dobr podpis od \"%s\""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[nejist]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnost podpisu skonila %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnost podpisu skon %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "podpis %s, hashovac algoritmus %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binrn formt"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "textov formt"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "neznm formt"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nemohu ovit podpis: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "toto nen podpis oddlen od dokumentu\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "VAROVN: detekovno vce podpis. Kontrolovn bude pouze prvn.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatn podpis tdy 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starho typu (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "nalezen neplatn koenov paket v proc_tree()\n"
@@ -4534,7 +4534,7 @@ msgstr "nemohu pracovat s algoritmem veejnho kle %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROVN: potencionln nebezpen symetricky zaifrovn kl sezen\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m nastaven kritick bit\n"
@@ -4820,58 +4820,63 @@ msgstr "VAROVN: Tento podkl byl revokovn svm vlastnkem!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Poznmka: Tento kl byl oznaen jako neplatn (disabled).\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Poznmka: Skonila platnost tohoto kle!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "VAROVN: Tento kl nen certifikovn dvryhodnm podpisem!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Nic nenaznauje tomu, e tento podpis pat vlastnkovi kle.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROVN: NEdvujeme tomuto kli!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Tento podpis je pravdpodobn PADLAN.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"VAROVN: Tento kl nen certifikovn dostaten dvryhodnmi podpisy!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nen jist, zda tento podpis pat vlastnkovi.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: peskoeno: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: peskoeno: veejn kl je ji obsaen v databzi\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Nespecifikoval jste identifiktor uivatele (user ID). Mete pout \"-r\"\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "Aktuln pjemci:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4879,33 +4884,33 @@ msgstr ""
"\n"
"Napite identifiktor uivatele (user ID). Ukonete przdnm dkem: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Takov identifiktor uivatele neexistuje.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "peskoeno: veejn kl je u nastaven podle implicitnho adresta\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Veejn kl je neplatn (disabled).\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "peskoeno: veejn kl je ji nastaven\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "neznm implicitn adrest \"%s\"\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: peskoeno: veejn kl je neplatn (disabled)\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "dn platn adresy\n"
diff --git a/po/da.po b/po/da.po
index e2ef9d595..aa0276800 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -32,7 +32,7 @@ msgstr ""
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -68,8 +68,8 @@ msgstr "kan ikke bne '%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
@@ -378,7 +378,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr ""
@@ -834,7 +834,7 @@ msgstr ""
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr ""
@@ -2700,21 +2700,21 @@ msgstr "signering fejlede: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Denne ngle er ikke beskyttet.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Nglen er beskyttet.\n"
@@ -2729,7 +2729,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "kodestningen blev ikke ordentlig gentaget; prv igen.\n"
@@ -3174,13 +3174,13 @@ msgid ""
msgstr ""
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "tilfj ngle"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "udlb"
@@ -3470,12 +3470,12 @@ msgstr "skriver selvsignatur\n"
msgid "writing key binding signature\n"
msgstr ""
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nsket nglestrrelse er %u bit\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
@@ -3566,7 +3566,7 @@ msgstr " (%d) ElGamal (kryptr kun)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) ElGamal (kryptr kun)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA nglepar vil have 1024 bit.\n"
@@ -3661,7 +3661,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3671,44 +3671,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Rigtige navn: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Navn m ikke starte med et tal\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal vre mindst 5 bogstaver langt\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruger '%s' tegnsttet.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3719,7 +3719,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -3734,24 +3734,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3759,12 +3759,12 @@ msgstr ""
"Du skal bruge en kodestning til at beskytte din hemmelige ngle.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3772,7 +3772,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3780,92 +3780,92 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Ngleoprettelse annulleret.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentligt certifikat til '%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ngle %08lX: offentlig ngle ikke fundet: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig ngle oprettet og signeret.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette?"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "hemmelige ngler import: %lu\n"
@@ -4208,112 +4208,112 @@ msgstr ""
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr ""
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
#, fuzzy
msgid "can't handle these multiple signatures\n"
msgstr "opret en separat signatur"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Denne ngle er ikke beskyttet.\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr ""
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
#, fuzzy
msgid "Key available at: "
msgstr "Ingen hjlp tilgngelig"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "DRLIG signatur fra \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "God signatur fra \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "God signatur fra \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr ""
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Denne ngle er ikke beskyttet.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Denne ngle er ikke beskyttet.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s signatur fra: %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr ""
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr ""
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
#, fuzzy
msgid "unknown"
msgstr "ukendt version"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan ikke tjekke signatur: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
#, fuzzy
msgid "not a detached signature\n"
msgstr "opret en separat signatur"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr ""
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) signatur\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
@@ -4458,7 +4458,7 @@ msgstr ""
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -4752,91 +4752,96 @@ msgstr "ADVARSEL: Denne underngle er blevet tilbagekaldt af dens ejer!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Bemrk: Denne ngle er forldet!\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Bemrk: Denne ngle er forldet!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Intet tyder p at denne signatur tilhrer ejeren.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ADVARSEL: Vi tror IKKE p denne ngle!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen er formentlig FORFALSKET.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Det er ikke sikkert at signaturen tilhrer ejeren.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: udelod: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: udelod: offentlig ngle er allerede tilstede\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
#, fuzzy
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
"\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Ingen sdan bruger-id.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "udeladt: offentlig ngle er allerede valgt som standard modtager\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Offentlig ngle er slet fra.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
#, fuzzy
msgid "skipped: public key already set\n"
msgstr "%s: udelod: offentlig ngle er allerede tilstede\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "ukendt standard modtager '%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: udelod: offentligngle er slet fra\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "ingen gyldige adresser\n"
diff --git a/po/de.po b/po/de.po
index 37a38afec..f188f2e5b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.4.1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
-"PO-Revision-Date: 2005-07-26 20:42+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
+"PO-Revision-Date: 2005-09-12 12:32+0200\n"
"Last-Translator: Walter Koch <koch@u32.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -68,8 +68,8 @@ msgstr "'%s' ist unlesbar: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "Hinweis: 'random_seed'-Datei bleibt unverndert\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -136,9 +136,9 @@ msgid "failed to store the creation date: %s\n"
msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
#: g10/app-openpgp.c:977
-#, fuzzy, c-format
+#, c-format
msgid "reading public key failed: %s\n"
-msgstr "Lesen des Schlssels fehlgeschlagen: %s\n"
+msgstr "Lesen des ffentlichen Schlssels fehlgeschlagen: %s\n"
#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
msgid "response does not contain the public key data\n"
@@ -375,7 +375,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP Karte Nr. %s erkannt\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgefhrt werden.\n"
@@ -823,7 +823,7 @@ msgstr ""
"Erzwungene Verwendung des symmetrischen Verschlsselungsverfahren %s (%d) "
"verletzt die Empfngervoreinstellungen\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
@@ -1409,9 +1409,9 @@ msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
#: g10/g10.c:2638
-#, fuzzy, c-format
+#, c-format
msgid "NOTE: %s is not available in this version\n"
-msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
+msgstr "HINWEIS: %d ist in dieser Version nicht vorhanden\n"
#: g10/g10.c:2653
#, fuzzy, c-format
@@ -1544,9 +1544,9 @@ msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
#: g10/g10.c:3048
-#, fuzzy, c-format
+#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "Entschlsselung fehlgeschlagen: %s\n"
+msgstr "Symmetrische Entschlsselung von `%s' fehlgeschlagen: %s\n"
#: g10/g10.c:3058
msgid "--encrypt [filename]"
@@ -2876,20 +2876,20 @@ msgstr "Beglaubigung fehlgeschlagen: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Dieser Schlssel ist nicht geschtzt.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Haupschlssels sind nicht vorhanden\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Geheime Teile des Haupschlssels sind nicht vorhanden\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Schlssel ist geschtzt.\n"
@@ -2906,7 +2906,7 @@ msgstr ""
"Geben Sie die neue Passphrase fr diesen geheimen Schlssel ein.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
@@ -3354,13 +3354,13 @@ msgstr ""
"Schlsselgltigkeit nicht notwendigerweise korrekt ist.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[widerrufen]"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3659,12 +3659,12 @@ msgstr "Die Eigenbeglaubigung wird geschrieben\n"
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ungltig Schlssellnge; %u Bit werden verwendet\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schlssellnge auf %u Bit aufgerundet\n"
@@ -3757,7 +3757,7 @@ msgstr " (%d) RSA (nur verschlsseln)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nur verschlsseln)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Das DSA-Schlsselpaar wird 1024 Bit haben.\n"
@@ -3862,7 +3862,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ist dies richtig? (j/N) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3879,44 +3879,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Ungltiges Zeichen im Namen\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name mu min. 5 Zeichen lang sein.\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "E-Mail-Adresse: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Diese E-Mail-Adresse ist ungltig\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Ungltiges Zeichen im Kommentar.\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3927,7 +3927,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
@@ -3942,23 +3942,23 @@ msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfBb"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "ndern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "ndern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3966,12 +3966,12 @@ msgstr ""
"Sie bentigen eine Passphrase, um den geheimen Schlssel zu schtzen.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3984,7 +3984,7 @@ msgstr ""
"aufrufen.\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3995,50 +3995,50 @@ msgstr ""
"untersttzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Schlsselerzeugung abgebrochen.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "schreiben des ffentlichen Schlssels nach '%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "schreiben des geheimen Schlssels nach '%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "schreiben des geheimen Schlssels nach '%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer ffentlicher Schlsselbund gefunden: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kein schreibbarer geheimer Schlsselbund gefunden: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des ff. Schlsselbundes `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des geheimen Schlsselbundes `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "ffentlichen und geheimen Schlssel erzeugt und signiert.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4048,12 +4048,12 @@ msgstr ""
"werden kann. Sie knnen aber mit dem Befehl \"--edit-key\" einen\n"
"Zweitschlssel fr diesem Zweck erzeugen.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlsselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4061,7 +4061,7 @@ msgstr ""
"Der Schlssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht berein)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4069,26 +4069,26 @@ msgstr ""
"Der Schlssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht berein)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HINWEIS: Unterschlssel fr v3-Schlssen sind nicht OpenPGP-konform\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "lschen des Schlsselblocks fehlgeschlagen: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "'%s' kann nicht erzeugt werden: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "Hinweis: geheimer Schlssel %08lX verfllt am %s\n"
@@ -4431,110 +4431,110 @@ msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "Unterschriften-berprfung unterdrckt\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "diese Mehrfachunterschriften knnen nicht behandelt werden\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Diese Unterschrift ist seit %s verfallen.\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu "ID" rein :-(
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Unterschrift vom %.*s, %s Schlssel ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Schlssel erhltlich bei: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "FALSCHE Unterschrift von \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Verfallene Unterschrift von \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekte Unterschrift von \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[ungewi] "
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Diese Unterschrift ist seit %s verfallen.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Diese Unterschrift verfllt am %s.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "Binre"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "Textmodus"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "unbekannt"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Unterschrift kann nicht geprft werden: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "keine abgetrennte Unterschrift\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"WARNUNG: Mehrfache Signaturen erkannt. Es wird nur die erste geprft.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "ungltiges root-Paket in proc_tree() entdeckt\n"
@@ -4680,7 +4680,7 @@ msgstr ""
"WARNUNG: Mglicherweise unsicherer symmetrisch verschlsselter "
"Sitzungsschlssel\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -4990,63 +4990,68 @@ msgstr "WARNUNG: Dieser Unterschlssel wurde von seinem Besitzer widerrufen!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Hinweis: Dieser Schlssel wurde abgeschaltet.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Hinweis: Dieser Schlssel ist verfallen!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "WARNUNG: Dieser Schlssel trgt keine vertrauenswrdige Signatur!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Es gibt keinen Hinweis, da die Signatur wirklich dem vorgeblichen "
"Besitzer gehrt.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlssel!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Die Signatur ist wahrscheinlich eine FLSCHUNG.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"WARNUNG: Dieser Schlssel ist nicht durch hinreichend vertrauenswrdige "
"Signaturen zertifiziert!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Es ist nicht sicher, da die Signatur wirklich dem vorgeblichen "
"Besitzer gehrt.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: bersprungen: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: bersprungen: ffentlicher Schlssel bereits vorhanden\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Sie haben keine User-ID angegeben (Sie knnen die Option \"-r\" verwenden).\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
#, fuzzy
msgid "Current recipients:\n"
msgstr "Derzeitige Voreinstellungenliste:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5054,34 +5059,34 @@ msgstr ""
"\n"
"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Keine solche User-ID vorhanden.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"bersprungen: ffentlicher Schlssel bereits als Standardempfnger gesetzt\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "ffentlicher Schlssel ist abgeschaltet.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "bersprungen: ffentlicher Schlssel bereits gesetzt\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Unbekannter voreingestellter Empfnger '%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: bersprungen: ffentlicher Schlssel ist abgeschaltet\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "Keine gltigen Adressaten\n"
@@ -5843,7 +5848,7 @@ msgstr "%d Schlssel verarbeitet (%d Validity Zhler gelscht)\n"
#: g10/trustdb.c:2138
msgid "no ultimately trusted keys found\n"
-msgstr "kein uneingeschrnkt vertrauenswrdiger Schlssel %08lX gefunden\n"
+msgstr "keine uneingeschrnkt vertrauenswrdige Schlssel gefunden\n"
#: g10/trustdb.c:2152
#, fuzzy, c-format
diff --git a/po/el.po b/po/el.po
index ef05d6448..7923eafeb 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -30,7 +30,7 @@ msgstr " \n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -68,8 +68,8 @@ msgstr " `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr ": random_seed\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -380,7 +380,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr " (batchmode)\n"
@@ -846,7 +846,7 @@ msgstr ""
" %s (%d) \n"
" \n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr " %s %s.\n"
@@ -2865,20 +2865,20 @@ msgstr " : %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr " .\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr " .\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr " .\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr " .\n"
@@ -2895,7 +2895,7 @@ msgstr ""
" .\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr " . "
@@ -3345,13 +3345,13 @@ msgstr ""
" .\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[]"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3651,12 +3651,12 @@ msgstr " -\n"
msgid "writing key binding signature\n"
msgstr " \"\" \n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr " , %u bits\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr " %u bits\n"
@@ -3747,7 +3747,7 @@ msgstr " (%d) RSA ( )\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA ( )\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr " DSA 1024 bits.\n"
@@ -3855,7 +3855,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr " (y/n); "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3872,44 +3872,44 @@ msgstr ""
" \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr " : "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr " \n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr " \n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr " 5 \n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr " Email: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr " Email\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr ": "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr " \n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr " `%s' .\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3920,7 +3920,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr " email \n"
@@ -3935,23 +3935,23 @@ msgstr " email \n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr " (N), (C), (E)mail (Q); "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr " (N), (C), (E)mail (O)/(Q); "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr ", \n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3959,12 +3959,12 @@ msgstr ""
" .\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3976,7 +3976,7 @@ msgstr ""
" , \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3988,50 +3988,50 @@ msgstr ""
" ) . \n"
" .\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr " .\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr " .\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4042,12 +4042,12 @@ msgstr ""
" \"--edit-key\" \n"
" .\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4055,7 +4055,7 @@ msgstr ""
" %lu ( \n"
" )\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4063,28 +4063,28 @@ msgstr ""
" %lu ( \n"
" )\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
": v3 \n"
" OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr " ; "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr " block : %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ": %08lX %s\n"
@@ -4424,109 +4424,109 @@ msgstr " ='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr " - \"gpg --import\" \n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr " \n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr " \n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr " %s.\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr " %.*s %s ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr " : "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr " \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr " \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr " \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr " %s.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr " %s.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s , %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr ""
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "-"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr ""
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr " : %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr " \n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
": . .\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr " 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr " (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr " (root) proc_tree()\n"
@@ -4675,7 +4675,7 @@ msgstr " %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ": \n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr " %d bit\n"
@@ -4981,59 +4981,64 @@ msgstr ""
msgid "Note: This key has been disabled.\n"
msgstr ": .\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr ": !\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
": "
"!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " .\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr ": !\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " .\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
": \n"
" !\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " .\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: : %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: : \n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr " user ID. ( \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5041,34 +5046,34 @@ msgstr ""
"\n"
" user ID. : "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr " user ID.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr ""
": \n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr " .\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr ": \n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr " `%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: : .\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr " \n"
diff --git a/po/eo.po b/po/eo.po
index d067fbc5d..5ac2ca02a 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -30,7 +30,7 @@ msgstr ""
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,8 +67,8 @@ msgstr "ne povas legi '%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "noto: dosiero random_seed ne aktualigita\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -377,7 +377,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga reimo\n"
@@ -835,7 +835,7 @@ msgstr "NOTO: ifrad-metodo %d ne trovita en preferoj\n"
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, fuzzy, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "Tiu komando ne eblas en la reimo %s.\n"
@@ -2839,20 +2839,20 @@ msgstr "subskribado malsukcesis: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "i tiu losilo ne estas protektita.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de efa losilo ne estas disponataj.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Sekretaj partoj de efa losilo ne estas disponataj.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "losilo estas protektita.\n"
@@ -2869,7 +2869,7 @@ msgstr ""
"Donu la novan pasfrazon por i tiu sekreta losilo.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "la pasfrazo ne estis uste ripetita; provu denove"
@@ -3318,13 +3318,13 @@ msgid ""
msgstr ""
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "rev"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "eksval"
@@ -3619,12 +3619,12 @@ msgstr "skribas mem-subskribon\n"
msgid "writing key binding signature\n"
msgstr "skribas losilbindan subskribon\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "losilgrando nevalida; uzas %u bitojn\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "losilgrando rondigita is %u bitoj\n"
@@ -3715,7 +3715,7 @@ msgstr " (%d) RSA (nur ifri)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (nur ifri)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA-losilparo havos 1024 bitojn.\n"
@@ -3823,7 +3823,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "u tio estas usta (j/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3839,44 +3839,44 @@ msgstr ""
" \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Vera nomo: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komencii per cifero\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena 5 signojn\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Retadreso: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Komento: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3887,7 +3887,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bonvolu ne meti la retadreson en la veran nomon a la komenton\n"
@@ -3902,23 +3902,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a la komenton\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "anu (N)omon, (K)omenton, (A)adreson, a (F)ini? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "anu (N)omon, (K)omenton, (A)adreson, a (B)one/(F)ini? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3926,12 +3926,12 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan losilon.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3943,7 +3943,7 @@ msgstr ""
"uzante i tiun programon kun la opcio \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3955,50 +3955,50 @@ msgstr ""
"kreado de la primoj; tio donas al la stokastilo pli bonan ancon\n"
"akiri sufie da entropio.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Kreado de losiloj nuligita.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skribas publikan losilon al '%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika losilaro trovita: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "neniu skribebla sekreta losilaro trovita: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eraro dum skribado de publika losilaro '%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eraro dum skribado de sekreta losilaro '%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta losiloj kreitaj kaj subskribitaj.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4007,12 +4007,12 @@ msgstr ""
"Notu, ke i tiu losilo ne estas uzebla por ifrado. Vi eble volos\n"
"uzi la komandon \"--edit-key\" por krei flankan losilon por tiu celo.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4020,7 +4020,7 @@ msgstr ""
"losilo estis kreita %lu sekundon en la estonteco (tempotordo a "
"horloeraro)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4028,26 +4028,26 @@ msgstr ""
"losilo estis kreita %lu sekundojn en la estonteco (tempotordo a "
"horloeraro)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTO: krei sublosilojn por v3-losiloj ne estas OpenPGP-kongrue\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "u vere krei? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTO: sekreta losilo %08lX eksvalidiis je %s\n"
@@ -4392,111 +4392,111 @@ msgstr "originala dosiernomo='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "memstara revoko - uzu \"gpg --import\" por apliki in\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "kontrolo de subskribo estas malaltita\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "ne povas trakti i tiujn pluroblajn subskribojn\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "i tiu losilo eksvalidios je %s.\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alinome \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Subskribo farita je %.*s per %s, losilo %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
#, fuzzy
msgid "Key available at: "
msgstr "Nenia helpo disponata"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "MALBONA subskribo de \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Eksvalidiinta subskribo de \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Bona subskribo de \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[malcerta]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alinome \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "i tiu losilo eksvalidios je %s.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "i tiu losilo eksvalidios je %s.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
#, fuzzy
msgid "binary"
msgstr "efa"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr ""
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
#, fuzzy
msgid "unknown"
msgstr "nekonata versio"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne povas kontroli subskribon: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "ne aparta subskribo\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "memstara subskribo de klaso 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "malnovstila subskribo (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "nevalida radikpaketo trovita en proc_tree()\n"
@@ -4642,7 +4642,7 @@ msgstr "ne povas trakti publiklosilan metodon %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas altitan \"critical bit\"\n"
@@ -4944,57 +4944,62 @@ msgstr "AVERTO: i tiu sublosilo estas revokita de sia posedanto!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Noto: i tiu losilo estas malaltita.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Noto: i tiu losilo eksvalidiis!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVERTO: i tiu losilo ne estas atestita kun fidata subskribo!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVERTO: Ni NE fidas i tiun losilon!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " La subskribo verajne estas FALSA.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVERTO: i tiu losilo ne estas atestita kun sufie fidataj subskriboj!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorita: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorita: publika losilo jam eestas\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5002,33 +5007,33 @@ msgstr ""
"\n"
"Donu la uzantidentigilon. Finu per malplena linio: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Uzantidentigilo ne ekzistas.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorita: publika losilo jam difinita kiel implicita ricevonto\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Publika losilo estas malaltita.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "ignorita: publika losilo jam agordita\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nekonata implicita ricevonto '%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorita: publika losilo estas malaltita\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
diff --git a/po/es.po b/po/es.po
index 21d7cec8a..302ee1504 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2005-03-25 16:50+0100\n"
"Last-Translator: Jaime Surez <jsuarez@ono.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "no se ha detectado mdulo acumulador de entropa\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -76,8 +76,8 @@ msgstr "no se puede leer `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -385,7 +385,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "tarjeta OpenPGP num. %s detectada\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
@@ -820,7 +820,7 @@ msgstr ""
"forzar el cifrado simtrico %s (%d) viola las preferencias\n"
"del destinatario\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "no puede usar %s en modo %s\n"
@@ -2802,19 +2802,19 @@ msgstr ""
"La clave tiene slo un apuntador u objetos de clave en la propia tarjeta\n"
"- no hay frase contrasea que cambiar.\n"
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Esta clave no est protegida.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Las partes secretas de la clave primaria no estn disponibles.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "La clave est protegida.\n"
@@ -2831,7 +2831,7 @@ msgstr ""
"Introduzca la nueva frase contrasea para esta clave secreta.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "frase contrasea repetida incorrectamente; intntelo de nuevo"
@@ -3248,12 +3248,12 @@ msgstr ""
"correcta a menos de que reinicie el programa.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "revocada"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "caducada"
@@ -3534,12 +3534,12 @@ msgstr "escribiendo autofirma\n"
msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobacin de clave\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamao de clave incorrecto; se usarn %u bits\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamao de clave redondeado a %u bits\n"
@@ -3628,7 +3628,7 @@ msgstr " (%d) RSA (slo cifrar)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (permite elegir capacidades)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "El par de claves DSA tendr %u bits.\n"
@@ -3733,7 +3733,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Es correcto? (s/n) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3749,44 +3749,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nombre y apellidos: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Caracter invlido en el nombre\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un nmero\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Direccin de correo electrnico: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Direccin invlida\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Caracter invlido en el comentario\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est usando el juego de caracteres `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3797,7 +3797,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no ponga la direccin de correo-e en el nombre real o en el "
@@ -3814,23 +3814,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Cambia (N)ombre, (C)omentario, (D)ireccin o (S)alir? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Cambia (N)ombre, (C)omentario, (D)ireccin o (V)ale/(S)alir? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Por favor corrija primero el error.\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3838,12 +3838,12 @@ msgstr ""
"Necesita una frase contrasea para proteger su clave secreta.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3855,7 +3855,7 @@ msgstr ""
"la opcin \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3868,50 +3868,50 @@ msgstr ""
"generador de nmeros aleatorios mayor oportunidad de recoger suficiente\n"
"entropa.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Creacin de claves cancelada.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "escribiendo clave pblica en `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escribiendo apuntador de la clave privada en `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "escribiendo clave privada en `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo pblico de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "anillo privado de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error escribiendo anillo pblico `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "claves pblica y secreta creadas y firmadas.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -3919,12 +3919,12 @@ msgstr ""
"Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
"la orden \"--edit-key\" para crear una subclave con este propsito.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creacin de la clave fallida: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -3932,7 +3932,7 @@ msgstr ""
"clave pblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3940,25 +3940,25 @@ msgstr ""
"clave pblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaves para claves V3 no sigue el estndar OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "Crear de verdad? (s/N) "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "almacenado de clave en la tarjeta fallido: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "no se puede crear fichero de respaldo `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -4294,108 +4294,108 @@ msgstr "nombre fichero original='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocacin independiente - use \"gpg --import\" para aplicarla\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "suprimida la verificacin de la firma\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "no se puede trabajar con firmas mltiples\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "Firmado el %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " usando %s clave %s\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Firmado el %s usando clave %s ID %s\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Clave disponible en: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma INCORRECTA de \"%s\""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma caducada de \"%s\""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "Firma correcta de \"%s\""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[incierto]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma caducada en %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "La firma caduca el %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "firma %s, algoritmo de resumen %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binaria"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "modotexto"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "desconocido"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "no es una firma separada\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "AVISO: detectadas mltiples firmas. Slo la primera se comprueba.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma independiente de clase 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "firma al viejo estilo (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquete raz invlido detectado en proc_tree()\n"
@@ -4539,7 +4539,7 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: clave de sesin cifrada simtricamente potencialmente insegura\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquete de tipo %d tiene el bit crtico activado\n"
@@ -4832,58 +4832,63 @@ msgstr "ATENCIN: Esta clave ha sido revocada por su propietario!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta clave est deshabilitada.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Nota: Esta clave ha caducado!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"ATENCIN: Esta clave no est certificada por una firma de confianza!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " No hay indicios de que la firma pertenezca al propietario.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATENCIN: Esta clave NO es de confianza!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma es probablemente una FALSIFICACIN.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ATENCIN: Esta clave no est certificada con firmas de suficiente "
"confianza!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " No es seguro que la firma pertenezca al propietario.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitida: clave pblica ya presente\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "Destinatarios actuales:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4891,33 +4896,33 @@ msgstr ""
"\n"
"Introduzca ID de usuario. Acabe con una lnea vaca: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "ID de usuario inexistente.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "omitida: clave pblica ya designada como destinataria por defecto\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Clave pblica deshabilitada.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "omitida: clave pblica ya establecida\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "desconocido el destinatario predefinido \"%s\"\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitida: clave pblica deshabilitada\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "no hay direcciones vlidas\n"
diff --git a/po/et.po b/po/et.po
index 39e682d90..b859c4806 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -30,7 +30,7 @@ msgstr "entroopia kogumise moodul puudub\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -66,8 +66,8 @@ msgstr "`%s' ei nnestu lugeda: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "mrkus: random_seed faili ei uuendatud\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -377,7 +377,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
@@ -836,7 +836,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"smmetrilise ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
@@ -2820,20 +2820,20 @@ msgstr "allkirjastamine ebannestus: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "See vti ei ole kaitstud.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse vtme salajased komponendid ei ole kttesaadavad.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Primaarse vtme salajased komponendid ei ole kttesaadavad.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Vti on kaitstud.\n"
@@ -2850,7 +2850,7 @@ msgstr ""
"Sisestage sellele salajasele vtmele uus parool.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "parooli ei korratud ieti; proovige uuesti"
@@ -3299,13 +3299,13 @@ msgstr ""
"nidatud vtme kehtivus olla tingimata korrektne.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[thistatud] "
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3596,12 +3596,12 @@ msgstr "kirjutan iseenda allkirja\n"
msgid "writing key binding signature\n"
msgstr "kirjutan vtit siduva allkirja\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane vtme suurus; kasutan %u bitti\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "vtme suurus mardatud les %u bitini\n"
@@ -3692,7 +3692,7 @@ msgstr " (%d) RSA (ainult krpteerimiseks)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ainult krpteerimiseks)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA vtmepaari pikkuseks saab 1024 bitti.\n"
@@ -3800,7 +3800,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "On see ige (j/e)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3816,44 +3816,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Prisnimi: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Lubamatu smbol nimes\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Nimi ei vi alata numbriga\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema vhemalt 5 smbolit\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "E-posti aadress: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Lubamatu smbol kommentaaris\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3864,7 +3864,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "rge palun kirjutage e-posti aadressi prisnimesse ega kommentaari\n"
@@ -3879,23 +3879,23 @@ msgstr "rge palun kirjutage e-posti aadressi prisnimesse ega kommentaari\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti vi (V)lju? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti vi (O)k/(V)lju? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Palun parandage kigepealt viga\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3903,12 +3903,12 @@ msgstr ""
"Te vajate oma salajase vtme kaitsmiseks parooli.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3920,7 +3920,7 @@ msgstr ""
"kasutades seda programmi vtmega \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3932,50 +3932,50 @@ msgstr ""
"kasutada kettaid jne), see annaks juhuarvude generaatorile vimaluse\n"
"koguda paremat entroopiat.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Vtme genereerimine katkestati.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjutan avaliku vtme faili `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike vtmete hoidlat pole: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjutatavat salajaste vtmete hoidlat pole: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "viga avaliku vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "viga salajase vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane vti on loodud ja allkirjastatud.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -3985,43 +3985,43 @@ msgstr ""
"Krptimiseks tuleb genereerida teine vti, seda saate teha\n"
"kasutades vtit \"--edit-key\".\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vtme genereerimine ebannestus: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "vti loodi %lu sekund tulevikus (ajahpe vi kella probleem)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "vti loodi %lu sekundit tulevikus (ajahpe vi kella probleem)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "MRKUS: v3 vtmetele alamvtmete loomine ei ole OpenPGP hilduv\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon testi? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "`%s' ei nnestu luua: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "MRKUS: salajane vti %08lX aegus %s\n"
@@ -4358,108 +4358,108 @@ msgstr "algne failinimi on='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "eraldiseisev thistus - realiseerimiseks kasutage \"gpg --import\"\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "allkirja kontroll jeti ra\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "neid allkirju ei nnestu tdelda\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allkiri aegus %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ka \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Allkirja li %.*s kasutades %s vtit ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Vtme leiate: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "HALB allkiri kasutajalt \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Aegunud allkiri kasutajalt \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Korrektne allkiri kasutajalt \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[ebakindel]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ka \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Allkiri aegus %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Allkiri aegub %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s allkiri, snumilhendi algoritm %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binaarne"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "tekstimood"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "tundmatu"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allkirja ei saa kontrollida: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "ei ole eraldiseisev allkiri\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "vana stiili (PGP 2.x) allkiri\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
@@ -4606,7 +4606,7 @@ msgstr ""
"HOIATUS: tenoliselt ebaturvaline smmeetriliselt krpteeritud sessiooni "
"vti\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil tbiga %d on kriitiline bitt seatud\n"
@@ -4905,57 +4905,62 @@ msgstr "HOIATUS: See alamvti on omaniku poolt thistatud!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Mrkus: See vti on blokeeritud.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Mrkus: See vti on aegunud!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "HOIATUS: Seda vtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Ei ole midagi, mis nitaks, et allkiri kuulub omanikule.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "HOIATUS: Me EI usalda seda vtit!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Allkiri on tenoliselt VLTSING.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"HOIATUS: Seda vtit ei ole sertifitseeritud piisavalt usaldatava "
"allkirjaga!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ei ole kindel, et allkiri kuulub omanikule.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: jtsin vahele: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: jtsin vahele: avalik vti on juba olemas\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Te ei mranud kasutaja IDd. (vite kasutada vtit \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4963,33 +4968,33 @@ msgstr ""
"\n"
"Sisestage kasutaja ID. Lpetage thja reaga: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Tundmatu kasutaja ID.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "jtsin vahele: avalik vti on juba vaikimisi saaja\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Avalik vti on blokeeritud.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "jtsin vahele: avalik vti on juba olemas\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: jtsin vahele: avalik vti on blokeeritud\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "kehtivaid aadresse pole\n"
diff --git a/po/fi.po b/po/fi.po
index 014acbb4e..d669f5010 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -46,7 +46,7 @@ msgstr "entropian keräysmoduulia ei havaittu\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -83,8 +83,8 @@ msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -397,7 +397,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
@@ -853,7 +853,7 @@ msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
@@ -2858,20 +2858,20 @@ msgstr "allekirjoitus epäonnistui: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Avainta ei ole suojattu.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Avain on suojattu.\n"
@@ -2888,7 +2888,7 @@ msgstr ""
"Syötä uusi salasana salaiselle avaimelle.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
@@ -3337,13 +3337,13 @@ msgstr ""
"ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[mitätöity] "
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3639,12 +3639,12 @@ msgstr "kirjoitetaan oma-allekirjoitus\n"
msgid "writing key binding signature\n"
msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -3735,7 +3735,7 @@ msgstr " (%d) RSA (vain salaus)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (vain salaus)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA-avainparissa on 1024 bittiä.\n"
@@ -3843,7 +3843,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Onko tämä oikein (k/e) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3861,44 +3861,44 @@ msgstr ""
" \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Oikea nimi: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Nimessä on epäkelpo merkki\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Nimi ei voi alkaa numerolla\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Sähköpostiosoite: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Huomautus: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Huomautuksessa on epäkelpo merkki\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Käytät merkistöä \"%s\".\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3909,7 +3909,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
@@ -3924,23 +3924,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnHhSsOoLl"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Ole hyvä ja korjaa ensin virhe\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3948,12 +3948,12 @@ msgstr ""
"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3965,7 +3965,7 @@ msgstr ""
"tämän ohjelman valitsimella \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3977,50 +3977,50 @@ msgstr ""
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4029,12 +4029,12 @@ msgstr ""
"Huomaa, että tätä avainta ei voida käyttää salaamiseen. Käytä komentoa\n"
"\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4042,7 +4042,7 @@ msgstr ""
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4050,26 +4050,26 @@ msgstr ""
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -4410,112 +4410,112 @@ msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "allekirjoituksen varmistus vaiennetaan\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "näitä allekirjoituksia ei voi käsitellä\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allekirjoitus vanheni %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " aka \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr ""
"Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Avain saatavilla kohteessa: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Vanhentunut allekirjoitus lähettäjältä \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Allekirjoitus täsmää lähettäjään \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[ei tiedossa]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " aka \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Allekirjoitus vanheni %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Allekirjoitus vanhenee %s\n"
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binääri"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "teksti"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "tuntematon "
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "allekirjoitus ei ole erillinen\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"VAROITUS: useita allekirjoituksia havaittu. Vain ensimmäisen voi "
"tarkistaa.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
@@ -4663,7 +4663,7 @@ msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -4968,60 +4968,65 @@ msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Huom: Tämä avain on poistettu käytöstä\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Huom: Tämä avain on vanhentunut!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
"haltijalleen.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
"allekirjoituksella!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ohitettu: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5029,33 +5034,33 @@ msgstr ""
"\n"
"Syötä käyttäjätunnus. Lopeta tyhjällä rivillä: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Käyttäjätunnusta ei löydy.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Julkinen avain on poistettu käytöstä\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "ohitettu: julkinen avain on jo asetettu\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "ei kelvollisia vastaanottajia\n"
diff --git a/po/fr.po b/po/fr.po
index 2b9fc84d4..4c833ef22 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2005-06-28 00:24+0200\n"
"Last-Translator: Gal Quri <gael@lautre.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -35,7 +35,7 @@ msgstr "aucun module de rcupration d'entropie n'a t trouv.\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -73,8 +73,8 @@ msgstr "impossible de lire `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "note: le fichier `random_seed' n'a pas t mis jour\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -388,7 +388,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "carte OpenPGP n %s dtecte\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
@@ -832,7 +832,7 @@ msgstr ""
"forcer le chiffrement symtrique %s (%d) entre en dsaccord\n"
"avec les prferences du destinataire\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
@@ -2863,21 +2863,21 @@ msgstr ""
"La cl possde seulement des items partiels ou stocks sur carte -\n"
"pas de phrase de passe changer.\n"
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Cette cl n'est pas protge.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parties secrtes de la cl principale ne sont pas disponibles.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
msgid "Secret parts of primary key are stored on-card.\n"
msgstr ""
"Les parties secrtes de la cl principale sont stockes sur la\n"
"carte.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "La cl est protge.\n"
@@ -2892,7 +2892,7 @@ msgid ""
"\n"
msgstr "Entrez la nouvelle phrase de passe pour cette cl secrte.\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "la phrase de passe n'a pas t correctement rpte ; recommencez."
@@ -3322,12 +3322,12 @@ msgstr ""
"correcte tant que vous n'avez pas relanc le programme.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "revoque"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "expire"
@@ -3625,12 +3625,12 @@ msgstr "criture de l'auto-signature\n"
msgid "writing key binding signature\n"
msgstr "criture de la signature de liaison\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Taille invalide; utilisation de %u bits\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie %u bits\n"
@@ -3719,7 +3719,7 @@ msgstr " (%d) RSA (chiffrement seul)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (indiquez vous-mme les capacits)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "La paire de cls DSA fera %u bits.\n"
@@ -3824,7 +3824,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est-ce correct ? (o/N) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3840,44 +3840,44 @@ msgstr ""
" Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> \n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nom rel: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Caractre invalide dans le nom\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Le nom doit faire au moins 5 caractres de long\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Adresse e-mail: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse e-mail valide\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Commentaire: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Caractre invalide dans le commentaire\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vous utilisez le jeu de caractres '%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3888,7 +3888,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Ne mettez pas d'adresse e-mail dans le nom rel ou dans le commentaire\n"
@@ -3904,23 +3904,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Corrigez l'erreur d'abord\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3929,12 +3929,12 @@ msgstr ""
"secrte.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3948,7 +3948,7 @@ msgstr ""
" --edit-key .\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3960,52 +3960,52 @@ msgstr ""
"pendant la gnration de nombres premiers; cela donne au gnrateur de\n"
"nombres alatoires une meilleure chance d'avoir assez d'entropie.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "La gnration de cl a t annule.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "criture de la cl publique dans `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "criture d'une cl secrte partielle dans `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "criture de la cl secrte dans `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
"aucun portes-cls public n'a t trouv avec des droits d'criture : %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
"aucun portes-cls secret n'a t trouv avec des droits d'criture : %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erreur durant l'criture du porte-cls public `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erreur durant l'criture du porte-cls secret `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "les cls publique et secrte ont t cres et signes.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4014,13 +4014,13 @@ msgstr ""
"utiliser la commande --edit-key pour gnrer une sous-cl \n"
"cette fin.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La gnration de cl a chou: %s\n"
# on s'amuse comme on peut...
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4028,7 +4028,7 @@ msgstr ""
"la cl a t cre %lu seconde dans le futur (rupture spatio-temporelle ou\n"
"problme d'horloge)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4036,26 +4036,26 @@ msgstr ""
"la cl a t cre %lu secondes dans le futur (rupture spatio-temporelle ou\n"
"problme d'horloge\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"NOTE: crer des sous-cls pour des cls v3 n'est pas conforme OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "Crer vraiment ? (o/N) "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "le stockage de la cl dans la carte a chou: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossible de crer le fichier de sauvegarde `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTE: sauvegarde de la cl de la carte dans `%s'\n"
@@ -4397,94 +4397,94 @@ msgstr "nom de fichier original: '%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "rvocation autonome - utilisez gpg --import pour l'appliquer\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "vrification de signature supprime\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "le traitement de ces signatures multiples est impossible\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "Signature faite le %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " en utilisant la cl %s %s\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signature faite le %s avec la cl %s ID %s\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Cl disponible sur: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "MAUVAISE signature de %s "
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature expire de %s "
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "Bonne signature de %s "
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[incertain]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " alias %s "
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "La signature a expir le %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "La signature expire le %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "signature %s, algorithme de hachage %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binaire"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "modetexte"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "inconnu"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossible de vrifier la signature: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "la signature n'est pas dtache\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
@@ -4492,16 +4492,16 @@ msgstr ""
"premire\n"
"sera vrifie.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signature autonome de classe 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "signature d'un ancien style (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquet racine invalide dtect dans proc_tree()\n"
@@ -4655,7 +4655,7 @@ msgstr ""
"AVERISSEMENT: la cl de session chiffre de manire symtrique est\n"
"potentiellement non sre\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un sous-paquet de type %d possde un bit critique\n"
@@ -4951,63 +4951,68 @@ msgstr "ATTENTION: Cette sous-cl t rvoque par son propritaire !\n"
msgid "Note: This key has been disabled.\n"
msgstr "Note: cette cl a t dsactive.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Note: Cette cl a expir !\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"ATTENTION: Cette cl n'est pas certifie avec une signature de confiance !\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Rien ne dit que la signature appartient son propritaire.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATTENTION: Nous ne faisons PAS confiance cette cl !\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " La signature est certainement FAUSSE.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ATTENTION: Les signatures de cette cl n'ont pas une confiance suffisante !\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Il n'est pas sr que la signature appartient son "
"propritaire.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignor: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignor: cl publique dj prsente\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Vous n'avez pas spcifi de nom d'utilisateur. (vous pouvez\n"
"utiliser -r)\n"
"\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "Rcipients actuels:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5015,33 +5020,33 @@ msgstr ""
"\n"
"Entrez le nom d'utilisateur, en terminant par une ligne vide: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Pas d'utilisateur de ce nom.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "ignor: la cl publique est dj le destinataire par dfaut\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "La cl publique est dsactive.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "ignor: cl publique dj active\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinataire par dfaut %s inconnu\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignor: la cl publique est dsactive\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "pas de destinataire valide\n"
diff --git a/po/gl.po b/po/gl.po
index 2d946373e..5622c425f 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -30,7 +30,7 @@ msgstr "non se detectou un mdulo de acumulacin de entropa\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -66,8 +66,8 @@ msgstr "non se pode ler de `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: o ficheiro random_seed non se actualiza\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -381,7 +381,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
@@ -846,7 +846,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forza-la cifra simtrica %s (%d) viola as preferencias do destinatario\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
@@ -2847,20 +2847,20 @@ msgstr "fallou a sinatura: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Esta chave non est protexida.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "as partes secretas da chave primaria non estn dispoibles.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "as partes secretas da chave primaria non estn dispoibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "A chave est protexida.\n"
@@ -2877,7 +2877,7 @@ msgstr ""
"Introduza o novo contrasinal para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; tnteo de novo"
@@ -3332,13 +3332,13 @@ msgstr ""
"correcta a menos que reinicie o programa.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[revocada] "
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3638,12 +3638,12 @@ msgstr "escribindo a propia sinatura\n"
msgid "writing key binding signature\n"
msgstr "escribindo unha sinatura que liga a chave\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamao de chave non vlido; empregando %u bits\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamao de chave redondeado a %u bits\n"
@@ -3734,7 +3734,7 @@ msgstr " (%d) RSA (s cifrar)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (s cifrar)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "O par de chaves DSA ha ter 1024 bits.\n"
@@ -3842,7 +3842,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Isto correcto? (s/n) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3859,44 +3859,44 @@ msgstr ""
" \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nome: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Caracter non vlido no nome\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "O nome non pode comezar cun dxito\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "O nome debe ter alomenos 5 caracteres\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Enderezo de E-mail: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Non un enderezo de e-mail vlido\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Carcter non vlido no comentario\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est a usa-lo xogo de caracteres `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3907,7 +3907,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor, non poa o enderezo de correo no nome real ou no comentario\n"
@@ -3923,23 +3923,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeAaSs"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)ar? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)ar? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Por favor, corrixa antes o erro\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3947,12 +3947,12 @@ msgstr ""
"Necesita un contrasinal para protexe-la sa chave secreta.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3964,7 +3964,7 @@ msgstr ""
"momento, empregando este programa coa opcin \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3976,50 +3976,50 @@ msgstr ""
"mentres se xeran os nmeros primos; isto proporcinalle ao xerador de\n"
"nmeros aleatorios unha opoertunidade de acumular entropa de abondo.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeracin de chaves.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "gravando a chave pblica en `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non se atopou un chaveiro pblico no que se poida escribir: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro pblico `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "creronse e asinronse as chaves pblica e secreta.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4029,12 +4029,12 @@ msgstr ""
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeracin da chave fallou: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4042,7 +4042,7 @@ msgstr ""
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4050,26 +4050,26 @@ msgstr ""
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a creacin de subchaves para chaves v3 non cumpre OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realmente? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -4407,109 +4407,109 @@ msgstr "nome do ficheiro orixinal='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocacin independente - empregue \"gpg --import\" para aplicar\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "verificacin de sinatura suprimida\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "non se poden manexar estas sinaturas mltiples\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "A sinatura caducou o %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Chave dispoible en: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Sinatura INCORRECTA de\""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Sinatura caducada de \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Sinatura correcta de \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[incerto]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "A sinatura caducou o %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "A sinatura caduca o %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binario"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "modo texto"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "descoecido"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Non foi posible verifica-la sinatura: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "non unha sinatura separada\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVISO: detectronse sinaturas mltiples. S se ha comproba-la primeira.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "sinatura independiente de clase 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "Sinatura vello estilo (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquete raz incorrecto detectado en proc_tree()\n"
@@ -4658,7 +4658,7 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: chave de sesin cifrada simetricamente potencialmente insegura\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un subpaquete de tipo %d ten o bit crtico posto\n"
@@ -4963,58 +4963,63 @@ msgstr "AVISO: Esta subchave est revocada polo propietario!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta chave est desactivada.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Nota: Esta chave xa caducou!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVISO: Esta chave non est certificada cunha sinatura de confianza!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Non hai indicacins de que a sinatura pertenza ao seu propietario.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: Esta chave NON de confianza!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Probablemente, a sinatura estea FALSIFICADA.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVISO: Esta chave non est certificada con sinaturas de suficiente "
"confianza!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Non seguro que a sinatura pertenza ao seu propietario.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitido: a chave pblica xa est presente\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5022,34 +5027,34 @@ msgstr ""
"\n"
"Introduza o ID de usuario. Remate cunha lia en branco: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Non hai tal ID de usuario.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"omitido: a chave pblica xa est estabrecida coma destinatario por defecto\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "A chave pblica est desactivada.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "omitido: chave pblica xa estabrecida\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario por defecto `%s' descoecido\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitido: a chave pblica est desactivada\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "non hai enderezos vlidos\n"
diff --git a/po/hu.po b/po/hu.po
index aab0bb274..702f61e82 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc Lszl <nfl@nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -30,7 +30,7 @@ msgstr "Nem szleltem entrpiagyjt modult.\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,8 +67,8 @@ msgstr "Nem tudom olvasni a(z) \"%s\" llomnyt: %s.\n"
msgid "note: random_seed file not updated\n"
msgstr "Megjegyzs: random_seed llomnyt nem frisstettem.\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -379,7 +379,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsinlni ktegelt mdban!\n"
@@ -835,7 +835,7 @@ msgstr "A %s (%d) tmrts hasznlata srti a cmzett preferenciit!\n"
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelez hasznlata srti a cmzett preferenciit!\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "Lehet, hogy nem hasznlhatja %s-t %s mdban!\n"
@@ -2832,20 +2832,20 @@ msgstr "Alrs sikertelen: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Ez a kulcs nem vdett.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Az elsdleges kulcs titkos rszei nem elrhetk.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Az elsdleges kulcs titkos rszei nem elrhetk.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "A kulcs vdett.\n"
@@ -2862,7 +2862,7 @@ msgstr ""
"rja be az j jelszt ehhez a titkos kulcshoz!\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "Nem ismtelte meg helyesen a jelszt! Prblja jra!"
@@ -3311,13 +3311,13 @@ msgstr ""
"felttlenl helyes, amg jra nem indtja a programot!\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[visszavont] "
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3612,12 +3612,12 @@ msgstr "nalrst rok.\n"
msgid "writing key binding signature\n"
msgstr "sszefz alrst rok.\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Kulcsmret rvnytelen; %u bitet hasznlok.\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Kulcsmretet felkerektettem %u bitre.\n"
@@ -3708,7 +3708,7 @@ msgstr " (%d) RSA (csak titkosts)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (csak titkosts)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "A DSA kulcspr 1024 bites lesz.\n"
@@ -3816,7 +3816,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ez gy helyes (i/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3833,44 +3833,44 @@ msgstr ""
" \"Heinrich Heine (a klt) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Teljes nv: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "rvnytelen karakter a nvben!\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "A nv lehet, hogy nem kezddhet szmmal!\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "A nv legalbb 5 karakter kell legyen!\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "E-mail cm: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Ez nem rvnyes e-mail cm.\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Megjegyzs: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "rvnytelen karakter a megjegyzsben!\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "n a(z) %s karakterkdolst hasznlja.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3881,7 +3881,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Krem, ne rakja az e-mail cmet a teljes nvbe vagy a megjegyzsbe!\n"
@@ -3896,24 +3896,24 @@ msgstr "Krem, ne rakja az e-mail cmet a teljes nvbe vagy a megjegyzsbe!\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnMmEeRrKk"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(N)v, (M)egjegyzs, (E)-mail megvltoztatsa vagy (K)ilps? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(N)v, (M)egjegyzs, (E)-mail megvltoztatsa vagy (R)endben/(K)ilps? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Krem, elbb javtsa ki a hibt!\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3921,12 +3921,12 @@ msgstr ""
"Most szksg van egy jelszra (vagy mondatra), amely a titkos kulcst vdi.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3938,7 +3938,7 @@ msgstr ""
"az \"--edit-key\" opcival.\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3950,50 +3950,50 @@ msgstr ""
"a lemezeket) a prmszm generlsa alatt. Ez segti a vletlenszm-\n"
"genertort, hogy entrpit tudjon gyjteni.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Kulcs ltrehozsa megszaktva.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "rom a kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem rhat nyilvnoskulcs-karikt talltam: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "Nem rhat titkoskulcs-karikt talltam: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" nyilvnoskulcs-karika rsakor: %s.\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika rsakor: %s.\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "A nyilvnos s titkos kulcsokat ltrehoztam s alrtam.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4003,46 +4003,46 @@ msgstr ""
"kvn ilyen clra ltrehozni, azt az \"--edit-key\" parancs segtsgvel\n"
"teheti meg.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgenerls sikertelen: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu msodperccel a jvben kszlt. (Idugrs vagy raproblma.)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu msodperccel a jvben kszlt. (Idugrs vagy raproblma.)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MEGJEGYZS: Alkulcsok ltrehozsa v3 kulcsokhoz nem OpenPGP-megfelel.\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Valban ltrehozzam? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Nem tudom ltrehozni a(z) \"%s\" llomnyt: %s.\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "MEGJEGYZS: %08lX titkos kulcs %s-kor lejrt.\n"
@@ -4384,108 +4384,108 @@ msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Klnll visszavons. Hasznlja a \"gpg --import\"-ot az alkalmazshoz!\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "Alrs-ellenrzs elnyomva.\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "Nem tudom kezelni ezeket a tbbszrs alrsokat!\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Az alrs lejrt: %s.\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " azaz \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Alrva: %.*s; kulcs: %s, %08lX.\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Kulcs tallhat: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ROSSZ alrs a kvetkeztl: \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Lejrt alrs a kvetkeztl: \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "J alrs a kvetkeztl: \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[bizonytalan]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " azaz \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Az alrs lejrt: %s.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Az alrs lejr: %s.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s alrs, %s kivonatol algoritmus.\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "Binris"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "Szvegmd"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "Ismeretlen md"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem tudom ellenrizni az alrst: %s.\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "Nem klnll alrs.\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "FIGYELEM: Tbbszrs alrst rzkeltem. Csak az elst ellenrzm.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x osztly klnll alrs.\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "Rgi stlus (PGP 2.x) alrs.\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "rvnytelen gykrcsomagot talltam a proc_tree() fggvnyben!\n"
@@ -4634,7 +4634,7 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztonsgos!\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "A %d tpus alcsomag kritikus bitje belltott.\n"
@@ -4939,58 +4939,63 @@ msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Megjegyzs: Ez a kulcs le lett tiltva.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Megjegyzs: Ez a kulcs lejrt!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "FIGYELEM: Ez a kulcs nincs hitelestve megbzhat alrssal!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "FIGYELEM: NEM bzunk ebben a kulcsban!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Az alrs valsznleg HAMIS.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"FIGYELEM: Ez a kulcs nincs igazolva kellkppen megbzhat alrssal!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nem biztos, hogy az alrs a tulajdonoshoz tartozik.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: kihagyva: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: kihagyva: nyilvnos kulcs mr szerepel\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Nem adott meg felhasznli azonostt! (Hasznlhatja a \"-r\" opcit.)\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4998,34 +5003,34 @@ msgstr ""
"\n"
"Adja meg a felhasznli azonostt! res sorral fejezze be: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Nincs ilyen felhasznli azonost.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"Kihagyva: Nyilvnos kulcs mr be lett lltva alaprtelmezett cmzettnek.\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Nyilvnos kulcs nincs engedlyezve.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "Kihagyva: Nyilvnos kulcs mr be lett lltva.\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Ismeretlen alaprtelmezett cmzett: \"%s\"\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: Kihagyva: Nyilvnos kulcs nincs engedlyezve.\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "Nincsenek rvnyes cmzettek!\n"
diff --git a/po/id.po b/po/id.po
index ff3a61edd..68c3e7e0a 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -32,7 +32,7 @@ msgstr "modul entropi gathering tidak terdeteksi\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -68,8 +68,8 @@ msgstr "tidak dapat membaca `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "catatan: file random_seed tidak diupdate\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -381,7 +381,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@ -839,7 +839,7 @@ msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
@@ -2848,20 +2848,20 @@ msgstr "gagal menandai: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Kunci ini tidak diproteksi.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Kunci diproteksi.\n"
@@ -2878,7 +2878,7 @@ msgstr ""
"Masukkan passphrase baru untuk kunci rahasia ini.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
@@ -3327,13 +3327,13 @@ msgstr ""
"kecuali anda memulai kembali program.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[revoked] "
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3631,12 +3631,12 @@ msgstr "menulis self signature\n"
msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize tidak valid; menggunakan %u bit\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize dibulatkan hingga %u bit\n"
@@ -3727,7 +3727,7 @@ msgstr " (%d) RSA (hanya enkripsi)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Keypair DSA akan memiliki 1024 bit.\n"
@@ -3835,7 +3835,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Benar (y/t)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3851,44 +3851,44 @@ msgstr ""
"user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nama sebenarnya: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Alamat email: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Komentar: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3898,7 +3898,7 @@ msgstr ""
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
@@ -3913,23 +3913,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Silakan perbaiki kesalahan ini dulu\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3937,12 +3937,12 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3955,7 +3955,7 @@ msgstr ""
"menggunakan program ini dengan pilihan \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3967,50 +3967,50 @@ msgstr ""
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "menulis kunci publik ke `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "kesalahan menulis keyring publik `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4020,45 +4020,45 @@ msgstr ""
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -4395,109 +4395,109 @@ msgstr "original file name='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "verifikasi signature tidak diabaikan\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "tidak dapat menangani banyak signature ini\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Signature kadaluwarsa %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Kunci tersedia di:"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "signature BURUK dari \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature kadaluarsa dari \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signature baik dari \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[uncertain]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Signature kadaluwarsa %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Signature kadaluarsa pada %s \n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "biner"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "modeteks"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "tidak dikenal"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Tidak dapat memeriksa signature: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "bukan detached signature\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "kelas signature mandiri 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "signature model lama (PGP 2.X)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
@@ -4643,7 +4643,7 @@ msgstr "tidak dapat menangani algoritma kunci publik %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -4947,57 +4947,62 @@ msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Catatan: Kunci ini telah ditiadakan\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Catatan: Kunci ini telah berakhir!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Tidak ada indikasi signature milik pemilik.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Signature mungkin palsu.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Tidak pasti signature milik pemilik.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: dilewati: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: dilewati: kunci publik telah ada\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5005,33 +5010,33 @@ msgstr ""
"\n"
"Masukkan user ID. Akhiri dengan baris kosong: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Tidak ada ID user tersebut.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Kunci publik dimatikan.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "dilewati: kunci publik telah diset\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "penerima baku tidak dikenal `%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: dilewati: kunci publik dimatikan\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "tidak ada alamat yang valid\n"
diff --git a/po/it.po b/po/it.po
index b6832b2bb..4ce9590ff 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-06-16 17:01+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -30,7 +30,7 @@ msgstr "non stato trovato il modulo per raccogliere l'entropia\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,8 +67,8 @@ msgstr "impossibile leggere `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: il file random_seed non stato aggiornato\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -382,7 +382,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
@@ -849,7 +849,7 @@ msgstr ""
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "non possibile usare %s in modalit %s\n"
@@ -2859,20 +2859,20 @@ msgstr "firma fallita: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Questa chiave non protetta.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "La chiave protetta.\n"
@@ -2889,7 +2889,7 @@ msgstr ""
"Inserisci la nuova passphrase per questa chiave segreta.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
@@ -3339,13 +3339,13 @@ msgstr ""
"finch non eseguirai di nuovo il programma.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[revocata]"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3648,12 +3648,12 @@ msgstr "scrittura della autofirma\n"
msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "dimensione della chiave non valida; uso %u bit\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -3744,7 +3744,7 @@ msgstr " (%d) RSA (cifra solo)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (cifra solo)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "La coppia DSA avr 1024 bit.\n"
@@ -3852,7 +3852,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr " giusto (s/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3869,44 +3869,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nome e Cognome: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Il nome non pu iniziare con una cifra\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Indirizzo di Email: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non valido\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Commento: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3917,7 +3917,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
@@ -3932,23 +3932,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Per favore correggi prima l'errore\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3956,12 +3956,12 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3973,7 +3973,7 @@ msgstr ""
"programma con l'opzione \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3985,50 +3985,50 @@ msgstr ""
"dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
"numeri casuali migliori possibilit di raccogliere abbastanza entropia.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scrittura della chiave pubblica in `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non stato trovato un portachiavi pubblico scrivibile: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non stato trovato un portachiavi segreto scrivibile: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4038,12 +4038,12 @@ msgstr ""
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4051,7 +4051,7 @@ msgstr ""
"la chiave stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4059,26 +4059,26 @@ msgstr ""
"la chiave stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -4418,108 +4418,108 @@ msgstr "nome del file originale='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "verifica della firma soppressa\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "impossibile gestire queste firme multiple\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Firma scaduta il %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Chiave disponibile presso: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma NON corretta da \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma scaduta da \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Firma valida da \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[incerta]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma scaduta il %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Questa firma scadr il %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binario"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "modo testo"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "sconosciuto"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "non una firma separata\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "ATTENZIONE: trovate firme multiple. Sar controllata solo la prima.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma solitaria di classe 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "firma vecchio stile (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
@@ -4670,7 +4670,7 @@ msgstr ""
"ATTENZIONE: la chiave di sessione cifrata simmetricamente potenzialmente\n"
"non sicura\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -4977,57 +4977,62 @@ msgstr "ATTENZIONE: questa subchiave stata revocata dal proprietario!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Nota: questa chiave stata disabilitata.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Nota: questa chiave scaduta!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "ATTENZIONE: questa chiave non certificata con una firma fidata!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Non ci sono indicazioni che la firma appartenga al proprietario.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma probabilmente un FALSO.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ATTENZIONE: questa chiave non certificata con firme abbastanza fidate!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Non sicuro che la firma appartenga al proprietario.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: saltata: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: saltata: chiave pubblica gi presente\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5035,33 +5040,33 @@ msgstr ""
"\n"
"Inserisci l'user ID. Termina con una riga vuota: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "saltata: chiave pubblica gi impostata come destinatario predefinito\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "La chiave pubblica disabilitata.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "saltata: chiave pubblica gi impostata\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: saltata: chiave pubblica disabilitata\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
diff --git a/po/ja.po b/po/ja.po
index 817b4d8d2..8f7569208 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-11-23 11:14+0900\n"
"Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -33,7 +33,7 @@ msgstr "ȥԡ⥸塼뤬ФƤޤ\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -69,8 +69,8 @@ msgstr "%sפɤޤ: %s\n"
msgid "note: random_seed file not updated\n"
msgstr ": random_seed եι򤷤ޤ\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -376,7 +376,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPno. %s򸡽\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "ϥХå⡼ɤǤϤǤޤ\n"
@@ -804,7 +804,7 @@ msgstr "ٹ: ̥르ꥺ %s (%d) ζͤΩޤ\n"
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "оΰŹˡ %s (%d) ζͤΩޤ\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%s%s⡼ɤǻȤȤϤǤޤ\n"
@@ -2750,20 +2750,20 @@ msgstr "̾˼Ԥޤ: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "θݸƤޤ\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "縰̩ʬޤ\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "縰̩ʬޤ\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "ݸƤޤ\n"
@@ -2780,7 +2780,7 @@ msgstr ""
"̩οѥե졼ϤƤ\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "ѥե졼ȷ֤Ƥޤ󡣺ϤƤ"
@@ -3217,12 +3217,12 @@ msgstr ""
"ȤȤǰƬˤƤ\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr ""
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "λ"
@@ -3503,12 +3503,12 @@ msgstr "ʽ̾񤭹ߤޤ\n"
msgid "writing key binding signature\n"
msgstr "бؤν̾񤭹ߤޤ\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "̵ʸĹ%uӥåȤˤޤ\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Ĺ%uӥåȤ˴ݤޤ\n"
@@ -3597,7 +3597,7 @@ msgstr " (%d) RSA (Ź沽Τ)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (ȼǽϤ)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSAФ1024ӥåȤˤʤޤ\n"
@@ -3704,7 +3704,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ǥ? (y/N) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3720,44 +3720,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "̾: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "̵̾ʸޤ\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "̾ǻϤƤϤޤ\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "̾5ʸʾǤʤФʤޤ\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Żҥ᡼롦ɥ쥹: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "ͭŻҥ᡼롦ɥ쥹ǤϤޤ\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr ": "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Ȥ̵ʸޤ\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "ʤʸ%sפȤäƤޤ\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3768,7 +3768,7 @@ msgstr ""
" %s\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Żҥ᡼Υɥ쥹̾䥳Ȥʤ褦\n"
@@ -3783,23 +3783,23 @@ msgstr "Żҥ᡼Υɥ쥹̾䥳Ȥʤ褦\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "̾(N)(C)Żҥ᡼(E)ѹޤϽλ(Q)? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "̾(N)(C)Żҥ᡼(E)ѹޤOK(O)λ(Q)? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "ޤ顼Ƥ\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3807,12 +3807,12 @@ msgstr ""
"̩ݸ뤿˥ѥե졼ޤ\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3824,7 +3824,7 @@ msgstr ""
"Ρ--edit-keyɥץǤĤǤѹǤޤ\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3835,50 +3835,50 @@ msgstr ""
"Ȥǥ˥Ȥ¾ΤȤ򤹤ȡҤ\n"
"𻨤礭ʤ䤹ʤΤǡᤤޤ\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "äޤ\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "%sפظ񤭹ߤޤ\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "%sפ̩֤񤭹ߤޤ\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "%sפ̩񤭹ߤޤ\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "߲ǽʸؤĤޤ: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "߲ǽ̩ؤĤޤ: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ء%sפνߥ顼: %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "̩ء%sפνߥ顼: %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "̩̾ޤ\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -3887,42 +3887,42 @@ msgstr ""
"θϰŹ沽ˤϻѤǤʤȤդƤŹ沽Ԥˤϡ\n"
"--edit-keyɥޥɤȤäƤ\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "˼Ԥޤ: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "%lṳˤǤޤ (ιԤפξ㳲Ǥ礦)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "%lṳˤǤޤ (ιԤפξ㳲Ǥ礦)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ": v3κϡOpenPGPŬ礷ޤ\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "˺ޤ? (y/N) "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "ɤؤθݴɤ˼Ԥޤ: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Хååסե%sפǤޤ: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ": ɸΥХååפ%sפ¸ޤ\n"
@@ -4252,108 +4252,108 @@ msgstr "Υե̾='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "Ωgpg --importɤȤäŬѤƤ\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "̾θڤά\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "¿Ž̾ϼ갷ޤ\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "%s˻ܤ줿̾\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " %s%s\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "%s%sID %sǻܤ줿̾\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "ʲ˸ޤ: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "%sɤ ̾"
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "%sɤδڤν̾"
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "%sɤ̾"
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[Գ]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " ̾%s"
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "ڤν̾ %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "ν̾%sλǤ\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s̾󥢥르ꥺ %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "Хʥ꡼"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "ƥȥ⡼"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "̤Τ"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "̾򸡺Ǥޤ: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "ʬΥ̾Ǥޤ\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "ٹ: ¿Ž̾θСǽΤΤޤ\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "饹0x%02xΩ̾\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "Ť (PGP 2.x) ν̾\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() ̵ʥ롼ȡѥåȤ򸡽Фޤ\n"
@@ -4495,7 +4495,7 @@ msgstr "Υ르ꥺ%dϡ갷ޤ\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "ٹ: Ū˷ݤоΰŹ沽å󸰤Ǥ\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%dβ̥ѥåȤ˥ƥ롦ӥåȤȯ\n"
@@ -4779,55 +4779,60 @@ msgstr "ٹ: ϽͭԤˤäƼƤޤ!\n"
msgid "Note: This key has been disabled.\n"
msgstr ": θϻѶػߤꤵƤޤ\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr ": θλǤ!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "ٹ: θϿѤǤ̾ǾƤޤ!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " ν̾ͭԤΤΤɤθڼʤޤ\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ٹ: θϿѤǤ !\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " ν̾Ϥ餯 ʪ Ǥ\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "ٹ: θϽʬ˿ѤǤ̾ǾƤޤ!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ν̾ͭԤΤΤɤοǤޤ\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: å: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: å: Ϥ⤦ޤ\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "桼IDꤷƤޤ (-rɤȤޤ礦) \n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "μ:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4835,33 +4840,33 @@ msgstr ""
"\n"
"桼IDϡԤǽλ: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Υ桼IDϤޤ\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "å: ϴμͤȤƤ⤦ѤߤǤ\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "ϻѶػߤǤ\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "å: Ϥ⤦ѤߤǤ\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "μ͡%sɤĤޤ\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: å: ϻѶػߤǤ\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "ͭʰ褬ޤ\n"
diff --git a/po/pl.po b/po/pl.po
index 9a67c47f5..7037bcb01 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.2.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-06-23 15:54+0200\n"
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -40,7 +40,7 @@ msgstr "modu gromadzenia entropii nie zosta wykryty\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -77,8 +77,8 @@ msgstr "nie mona odczyta ,,%s'': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -396,7 +396,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nie dziaa w trybie wsadowym\n"
@@ -859,7 +859,7 @@ msgstr "wymuszone uycie kompresji %s (%d) kci si z ustawieniami adresata\n"
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "wymuszone uycie szyfru %s (%d) kci si z ustawieniami adresata\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%s nie jest dostpne w trybie %s\n"
@@ -2867,20 +2867,20 @@ msgstr "zoenie podpisu nie powiodo si: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Ten klucz nie jest chroniony.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz tajna gwnego klucza jest niedostpna.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Cz tajna gwnego klucza jest niedostpna.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Klucz jest chroniony.\n"
@@ -2897,7 +2897,7 @@ msgstr ""
"Wprowad nowe dugie, skomplikowane haso dla tego klucza tajnego.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "haso nie zostao poprawnie powtrzone; jeszcze jedna prba"
@@ -3349,13 +3349,13 @@ msgstr ""
"dopki program nie zostanie uruchomiony ponownie.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[uniewaniony]"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "data"
@@ -3649,12 +3649,12 @@ msgstr "zapis podpisu klucza nim samym\n"
msgid "writing key binding signature\n"
msgstr "zapis podpisu wicego klucz\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "niewaciwa dugo klucza; wykorzystano %u bitw\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rozmair klucza zaokrglony do %u bitw\n"
@@ -3745,7 +3745,7 @@ msgstr " (%d) RSA (tylko do szyfrowania)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (tylko do szyfrowania)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Para kluczy dla DSA bdzie miaa 1024 bity dugoci.\n"
@@ -3853,7 +3853,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Czy wszystko si zgadza (t/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3870,44 +3870,44 @@ msgstr ""
" \"Tadeusz eleski (Boy) <tzb@ziemianska.pl>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Imi i nazwisko: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Niewaciwy znak w imieniu lub nazwisku\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Imi lub nazwisko nie moe zaczyna si od cyfry\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Imi i nazwisko musz mie conajmniej 5 znakw dugoci.\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "To nie jest poprawny adres poczty elektronicznej\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Komentarz: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Niewaciwy znak w komentarzu\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Uywasz zestawu znakw %s.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3918,7 +3918,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Nie nalezy umieszcza adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -3935,37 +3935,37 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmieni (I)mi/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmieni (I)mi/nazwisko, (K)omentarz, adres (E)mail, przej (D)alej,\n"
"czy (W)yj z programu ? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Najpierw trzeba poprawi ten bd\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
"Musisz poda dugie, skomplikowane haso aby ochroni swj klucz tajny.\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3977,7 +3977,7 @@ msgstr ""
"\"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3993,50 +3993,50 @@ msgstr ""
"iloci\n"
"entropii.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zostaa anulowana.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuj klucz publiczny w '%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuj klucz tajny w '%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuj klucz tajny w '%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "bd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "bd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zostay utworzone i podpisane.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4045,12 +4045,12 @@ msgstr ""
"Ten klucz nie moe by wykorzystany do szyfrowania. Komend \"--edit-key\"\n"
"mona doda do niego podklucz szyfrujcy.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powioda si: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4058,7 +4058,7 @@ msgstr ""
"klucz zosta stworzony %lu sekund w przyszoci (zaburzenia\n"
"czasoprzestrzeni, lub le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4066,27 +4066,27 @@ msgstr ""
"klucz zosta stworzony %lu sekund w przyszoci (zaburzenia\n"
"czasoprzestrzeni, lub le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzy? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "usunicie bloku klucza nie powiodo si: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nie mona utworzy ,,%s'': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "UWAGA: wano klucza tajnego %08lX wygasa %s\n"
@@ -4424,109 +4424,109 @@ msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"osobny certyfikat uniewanienia - uyj ,,gpg --import'' aby go wczyta\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "wymuszono pominicie sprawdzenia podpisu\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "nie mona obsuzy tych wielokrotnych podpisw\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Wano podpisu wygasa %s.\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Klucz dostpny w: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "NIEPOPRAWNY podpis zoony przez \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Przeterminowany podpis zoony przez \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Poprawny podpis zoony przez \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[niepewne]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Wano podpisu wygasa %s.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Wano podpisu wygasa %s.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "podpis %s, skrt %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binarny"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "tekstowy"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "nieznany"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie mona sprawdzi podpisu: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "nie jest oddzielonym podpisem.\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"OSTRZEENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "oddzielony podpis klasy 0x%02x.\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starego typu (PGP 2.x).\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
@@ -4672,7 +4672,7 @@ msgstr ""
"OSTRZEENIE: symetrycznie zaszyfrowany klucz sesyjny moe nie by "
"bezpieczny\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -4973,59 +4973,64 @@ msgstr "OSTRZEENIE: Ten podklucz zosta uniewaniony przez waciciela!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Uwaga: Ten klucz zosta wyczony z uytku\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Uwaga: Data wanoci tego klucza upyna!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "OSTRZEENIE: Ten klucz nie jest powiadczony zaufanym podpisem!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Nie ma pewnoci co do tosamoci osoby ktra zoya podpis.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "OSTRZEENIE: NIE UFAMY temu kluczowi!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Ten podpis prawdopodobnie jest FASZYWY.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"OSTRZEENIE: Tego klucza nie powiadczaj wystarczajco zaufane podpisy!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Nie ma pewnoci co do tosamoci osoby ktra zoya ten "
"podpis.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: pominity: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: pominity: zosta ju wybrany w innej opcji\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Nie zosta podany identyfikatora uytkownika (np za pomoc ,,-r'')\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5033,33 +5038,33 @@ msgstr ""
"\n"
"Identyfikator uytkownika (pusta linia oznacza koniec): "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Brak takiego identyfikatora uytkownika.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "pominity: klucz publiczny ju jest domylnym adresatem\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Klucz publiczny wyczony z uycia.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "pominity: zosta ju wybrany w innej opcji\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nieznany domylny adresat ,,%s''\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: pominity: klucz publiczny wyczony z uytku\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "brak poprawnych adresatw\n"
diff --git a/po/pt.po b/po/pt.po
index 3d12b380b..12e630fc1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
@@ -33,7 +33,7 @@ msgstr "nenhum mdulo de recolha de entropia detectado\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -70,8 +70,8 @@ msgstr "impossvel ler `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: ficheiro random_seed no actualizado\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -380,7 +380,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossvel fazer isso em modo no-interativo\n"
@@ -841,7 +841,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ao forar a cifra simtrica %s (%d) viola as preferncias do destinatrio\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "no pode utilizar %s enquanto estiver no modo %s\n"
@@ -2842,20 +2842,20 @@ msgstr "assinatura falhou: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Componentes secretas da chave primria no disponveis.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Componentes secretas da chave primria no disponveis.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "A chave protegida.\n"
@@ -2872,7 +2872,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "a frase secreta no foi repetida corretamente; tente outra vez"
@@ -3324,13 +3324,13 @@ msgstr ""
"correcta a no ser que reinicie o programa.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "revkey"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3622,12 +3622,12 @@ msgstr "a escrever a auto-assinatura\n"
msgid "writing key binding signature\n"
msgstr "a escrever a assinatura ligada a uma chave\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamanho de chave invlido; a utilizar %u bits\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamanho da chave arredondado para %u bits\n"
@@ -3718,7 +3718,7 @@ msgstr " (%d) RSA (apenas cifragem)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "O par de chaves DSA ter 1024 bits.\n"
@@ -3826,7 +3826,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est correto (s/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3844,44 +3844,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Caracter invlido no nome\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "O nome no pode comear com um dgito\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Endereo de correio eletrnico: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Endereo eletrnico invlido\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Comentrio: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Caracter invlido no comentrio\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc est usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3892,7 +3892,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no coloque o endereo de email no nome verdadeiro ou no "
@@ -3909,23 +3909,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Mudar (N)ome, (C)omentrio, (E)mail ou (S)air? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Mudar (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Por favor corrija primeiro o erro\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3933,12 +3933,12 @@ msgstr ""
"Voc precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3950,7 +3950,7 @@ msgstr ""
"qualquer hora, usando este programa com a opo \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3962,50 +3962,50 @@ msgstr ""
"gerao dos nmeros primos; isso d ao gerador de nmeros aleatrios\n"
"uma hiptese maior de ganhar entropia suficiente.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Gerao de chave cancelada.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "a escrever chave pblica para `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenhum porta-chaves pblico com permisses de escrita encontrado: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenhum porta-chaves secreto com permisses de escrita encontrado: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves pblico `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "chaves pblica e privada criadas e assinadas.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4014,12 +4014,12 @@ msgstr ""
"Note que esta chave no pode ser usada para cifragem. Voc pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secundria para esse fim.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4027,7 +4027,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4035,26 +4035,26 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a criao de sub-chave para chaves v3 no respeito o OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossvel criar `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -4392,112 +4392,112 @@ msgstr "nome do ficheiro original='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocao solitria - utilize \"gpg --import\" para aplicar\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "verificao de assinatura suprimida\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "no consigo tratar estas assinaturas mltiplas\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Esta assinatura expirou em %s.\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ou \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
#, fuzzy
msgid "Key available at: "
msgstr "Nenhuma ajuda disponvel"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Assinatura INCORRECTA de \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Assinatura expirada de \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Assinatura correcta de \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[incerto]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ou \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Esta assinatura expirou em %s.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Esta assinatura expirou em %s.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
#, fuzzy
msgid "binary"
msgstr "primary"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr ""
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
#, fuzzy
msgid "unknown"
msgstr "verso desconhecida"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossvel verificar assinatura: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "no uma assinatura separada\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVISO: vrias assinaturas detectadas. Apenas a primeira ser verificada.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura de classe 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pacote raiz invlido detectado em proc_tree()\n"
@@ -4644,7 +4644,7 @@ msgstr "impossvel manipular algoritmo de chave pblica %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crtico ligado\n"
@@ -4948,57 +4948,62 @@ msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Nota: Esta chave foi desactivada.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Nota: Esta chave expirou!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVISO: Esta chave no est certificada com uma assinatura confivel!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " No h indicao de que a assinatura pertence ao dono.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: Ns NO confiamos nesta chave!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " A assinatura provavelmente uma FALSIFICAO.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVISO: Esta chave no est certificada com assinaturas suficientemente\n"
" confiveis!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " No se tem certeza de que a assinatura pertence ao dono.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorado: a chave pblica j est presente\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "No especificou um identificador de utilizador. (pode usar \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5006,33 +5011,33 @@ msgstr ""
"\n"
"Insira o identificador do utilizador. Termine com uma linha vazia: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Identificador de utilizador inexistente.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorado: chave pblica j colocada como destinatrio por omisso\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "A chave pblica est desativada.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "ignorado: a chave pblica j est presente\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatrio por omisso desconhecido `%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorado: a chave pblica est desactivada\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "nenhum endereo vlido\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1a2767603..d2cfed6b2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gnupg 1.0\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -37,7 +37,7 @@ msgstr ""
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -74,8 +74,8 @@ msgstr "impossvel abrir `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
@@ -385,7 +385,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossvel fazer isso em modo no-interativo\n"
@@ -846,7 +846,7 @@ msgstr "NOTA: algoritmo de criptografia %d no encontrado nas preferncias\n"
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr ""
@@ -2789,21 +2789,21 @@ msgstr "assinatura falhou: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "chave secreta no disponvel"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "chave secreta no disponvel"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "A chave protegida.\n"
@@ -2820,7 +2820,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "A frase secreta no foi repetida corretamente; tente outra vez.\n"
@@ -3270,13 +3270,13 @@ msgid ""
msgstr ""
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "revkey"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3571,12 +3571,12 @@ msgstr "escrevendo auto-assinatura\n"
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido %u bits\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
@@ -3667,7 +3667,7 @@ msgstr " (%d) ElGamal (apenas criptografia)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "O par de chaves DSA ter 1024 bits.\n"
@@ -3776,7 +3776,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est correto (s/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3793,44 +3793,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Caractere invlido no nome\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "O nome no pode comear com um dgito\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Endereo de correio eletrnico: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Endereo eletrnico invlido\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Comentrio: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Caractere invlido no comentrio\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc est usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3841,7 +3841,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
@@ -3856,24 +3856,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muda (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muda (N)ome, (C)omentrio, (E)ndereo ou (O)k/(S)air? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3881,12 +3881,12 @@ msgstr ""
"Voc precisa de uma frase secreta para proteger sua chave.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3898,7 +3898,7 @@ msgstr ""
"qualquer hora, usando este programa com a opo \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3910,50 +3910,50 @@ msgstr ""
"gerao dos nmeros primos; isso d ao gerador de nmeros aleatrios\n"
"uma chance melhor de conseguir entropia suficiente.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Gerao de chave cancelada.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado pblico para `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "chave %08lX: chave pblica no encontrada: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "impossvel bloquear chaveiro secreto: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "chaves pblica e privada criadas e assinadas.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -3962,12 +3962,12 @@ msgstr ""
"Note que esta chave no pode ser usada para criptografia. Voc pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secundria para esse fim.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -3975,7 +3975,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3983,26 +3983,26 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossvel criar %s: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -4349,112 +4349,112 @@ msgstr "nome de arquivo original='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revogao isolada - use \"gpg --import\" para aplic-la\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "verificao de assinatura suprimida\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
#, fuzzy
msgid "can't handle these multiple signatures\n"
msgstr "fazer uma assinatura separada"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Esta chave no protegida.\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ou \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
#, fuzzy
msgid "Key available at: "
msgstr "Nenhuma ajuda disponvel"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Assinatura INCORRETA de \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Assinatura correta de \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Assinatura correta de \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr ""
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ou \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Esta chave no protegida.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Esta chave no protegida.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "assinatura %s de: %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr ""
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr ""
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
#, fuzzy
msgid "unknown"
msgstr "verso desconhecida"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossvel verificar assinatura: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
#, fuzzy
msgid "not a detached signature\n"
msgstr "fazer uma assinatura separada"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura isolada da classe 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pacote raiz invlido detectado em proc_tree()\n"
@@ -4599,7 +4599,7 @@ msgstr "impossvel manipular algoritmo de chave pblica %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crtico ligado\n"
@@ -4905,93 +4905,98 @@ msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Esta chave foi desativada"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Nota: Esta chave expirou!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "AVISO: Esta chave no est certificada com uma assinatura confivel!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " No h indicao de que a assinatura pertence ao dono.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVISO: Ns NO confiamos nesta chave!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " A assinatura provavelmente uma FALSIFICAO.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVISO: Esta chave no est certificada com assinaturas suficientemente\n"
" confiveis!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " No se tem certeza de que a assinatura pertence ao dono.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorado: a chave pblica j est presente\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
#, fuzzy
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Voc no especificou um identificador de usurio. (pode-se usar \"-r\")\n"
"\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Identificador de usurio inexistente.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorado: chave pblica j marcada como destinatrio padro\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "A chave pblica est desativada.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
#, fuzzy
msgid "skipped: public key already set\n"
msgstr "%s: ignorado: a chave pblica j est presente\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatrio padro desconhecido `%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorado: a chave pblica est desativada\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "nenhum endereo vlido\n"
diff --git a/po/ro.po b/po/ro.po
index 9088148be..56eda4f62 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -34,7 +34,7 @@ msgstr "nu a fost gsit nici un modul de adunare a entropiei\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -72,8 +72,8 @@ msgstr "nu pot citi `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "not: fiierul random_seed nu a fost actualizat\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -381,7 +381,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "cardul OpenPGP nr. %s detectat\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru n modul batch\n"
@@ -817,7 +817,7 @@ msgstr ""
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "fornd cifrul simetric %s (%d) violai preferinele destinatarului\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "nu putei folosi %s ct vreme n modul %s\n"
@@ -2813,19 +2813,19 @@ msgstr ""
"Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz "
"parol de schimbat.\n"
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Aceast cheie nu este protejat.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Prile secrete ale cheii primare nu sunt disponibile.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Pri secrete ale cheii primare sunt stacate pe card.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Cheia este protejat.\n"
@@ -2842,7 +2842,7 @@ msgstr ""
"Introducei noua fraz-parol pentru acest cheie secret.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "fraza-parol nu a fost repetat corect; mai ncercai o dat"
@@ -3266,12 +3266,12 @@ msgstr ""
#
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "revocat"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "expirat"
@@ -3556,12 +3556,12 @@ msgstr "scriu auto semntur\n"
msgid "writing key binding signature\n"
msgstr "scriu semntur legat de cheie\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "lungime cheie invalid; folosesc %u bii\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "lungime cheie rotunjit la %u bii\n"
@@ -3650,7 +3650,7 @@ msgstr " (%d) RSA (numai cifrare)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (seteaz singur capabilitile)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Perechea de chei DSA va avea %u bii.\n"
@@ -3755,7 +3755,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Este aceasta corect? (d/N) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3772,44 +3772,44 @@ msgstr ""
" \"Popa Ioan (popic) <popa.ioan@compania.ro>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Nume real: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Caracter invalid n nume\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Numele nu poate ncepe cu o cifr\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Numele trebuie s fie de cel puin 5 caractere\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Adres de email: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Nu este o adres de email valid\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Comentariu: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Caracter invalid n comentariu\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Folosii setul de caractere `%s'\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3820,7 +3820,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "V rugm nu punei adresa de email n numele real sau comentariu\n"
@@ -3835,23 +3835,23 @@ msgstr "V rugm nu punei adresa de email n numele real sau comentariu\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoTt"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Schimb (N)ume, (C)omentariu, (E)mail sau (T)Termin? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Schimb (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "V rugm corectai mai nti eroarea\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3859,12 +3859,12 @@ msgstr ""
"Avei nevoie de o fraz-parol pentru a v proteja cheia secret.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3875,7 +3875,7 @@ msgstr ""
"O s o fac oricum. Putei schimba fraza-parol oricnd, folosind acest\n"
"program cu opiunea \"--edit-key\".\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3887,50 +3887,50 @@ msgstr ""
"n timpul generrii numerelor prime; aceasta d o ans generatorului de\n"
"numere aleatoare o ans mai bun de a aduna destul entropie.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulat.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scriu cheia public n `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scriu talonul (stub) cheii secrete n `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scriu cheia secret n `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nu am gsit nici un inel de chei public de scris: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nu am gsit nici un inel de chei secret de scris: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "cheile secret i public au fost create i semnate.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -3940,12 +3940,12 @@ msgstr ""
"s folosii comanda \"--edit-key\" pentru a genera o subcheie secundar\n"
"pentru acest scop.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a euat: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -3953,7 +3953,7 @@ msgstr ""
"cheia a fost creat %lu secund n viitor (warp n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3961,25 +3961,25 @@ msgstr ""
"cheia a fost creat %lu secunde n viitor (warp n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOT: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "Creai ntr-adevr? (d/N) "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "stocarea cheii pe card a euat: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nu pot crea fiier de rezerv `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOT: copia de sigurana a cheii cardului salvat la `%s'\n"
@@ -4313,109 +4313,109 @@ msgstr "nume fiier original='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocare standalone - folosii \"gpg --import\" pentru a aplica\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "verificare semntur eliminat\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "nu pot mnui aceste semnturi multiple\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "Semntur fcut %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " folosind cheia %s %s\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Semntur fcut %s folosind cheia %s cu ID %s\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Cheie disponibil la: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Semntur INCORECT din \"%s\""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Semntur expirat din \"%s\""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "Semntur bun din \"%s\""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[nesigur]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " aka \"%s\""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Semntur expirat %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Semntura expir %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "semntur %s, algoritm rezumat %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binar"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "modtext"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "necunoscut"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nu pot verifica semntura: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "nu o semntur detaat\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"AVERTISMENT: am detectat multiple semnturi. Numai prima va fi verificat.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "semntur de sine stttoare (standalone) de clas 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "semntur de stil vechi (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pachet root invalid detectat n proc_tree()\n"
@@ -4563,7 +4563,7 @@ msgstr ""
"AVERTISMENT: cheie de sesiune cifrat simetric potenial nesigur "
"(insecure)\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -4861,59 +4861,64 @@ msgstr "AVERTISMENT: Aceast cheie a fost revocat de proprietarul ei!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Not: Aceast cheie a fost deactivat.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Not: Aceast cheie a expirat!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr ""
"AVERTISMENT: Aceast cheie nu este certificat de o semntur de ncredere!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Nu exist nici o indicaie c semntura aparine proprietarului.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "AVERTISMENT: Noi NU avem ncredere n aceast cheie!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Semntura este probabil un FALS.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"AVERTISMENT: Aceast cheie nu este certificat cu suficiente semnturi de "
"ncredere!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nu este sigur c semntura aparine proprietarului.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: srit: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: srit: cheia public este deja prezent\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Nu ai specificat un ID utilizator. (putei folosi \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "Destinatari cureni:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4921,33 +4926,33 @@ msgstr ""
"\n"
"Introducei ID-ul utilizator. Terminai cu o linie nou: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Nu exist acest ID utilizator.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "srit: cheia public setat deja ca destinatar implicit\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Cheia public este deactivat.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "srit: cheia public setat deja\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatar implicit necunoscut \"%s\"\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: srit: cheia public este deactivat\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "nici un destinatar valid\n"
diff --git a/po/ru.po b/po/ru.po
index e4bea5468..e0c40c45c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 1.4.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2005-06-22 02:53+0200\n"
"Last-Translator: Maxim Britov <maxbritov@tut.by>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -32,7 +32,7 @@ msgstr "не найден модуль накопления энтропии\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -68,8 +68,8 @@ msgstr "не могу прочитать `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "замечание: файл random_seed не обновлен\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -377,7 +377,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s \n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "невозможно сделать это в пакетном режиме\n"
@@ -806,7 +806,7 @@ msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) наруша
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "Вы не можете использовать %s в режиме %s\n"
@@ -2780,19 +2780,19 @@ msgstr "не удалось подписать: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Данный ключ не защищен.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретная часть главного ключа отсутствует.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Секретная часть главного ключа сохранена на карте.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Ключ защищен.\n"
@@ -2809,7 +2809,7 @@ msgstr ""
"Введите новый пароль для данного секретного ключа.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
@@ -3225,12 +3225,12 @@ msgstr ""
"пока Вы не перезапустите программу.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "отозван"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "просрочен с"
@@ -3510,12 +3510,12 @@ msgstr "сохраняем самоподпись\n"
msgid "writing key binding signature\n"
msgstr "сохраняем объединяющую подпись\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "неверный размер ключа; используется %u бит\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "размер ключа приведен к %u битам\n"
@@ -3604,7 +3604,7 @@ msgstr " (%d) RSA (только для шифрования)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (с требуемыми возможностями)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
@@ -3709,7 +3709,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Все верно? (y/N) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3724,44 +3724,44 @@ msgstr ""
" \"Baba Yaga (pensioner) <yaga@deepforest.ru>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Ваше настоящее имя: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Недопустимый символ в Имени\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Имя не должно начинаться с цифры\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Имя не должно быть короче 5 символов\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "Email-адрес: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Неправильный e-mail адрес\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Комментарий: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Недопустимый символ в комментарии\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Используется таблица символов: `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3772,7 +3772,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
@@ -3787,24 +3787,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Сначала исправьте ошибку\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3812,12 +3812,12 @@ msgstr ""
"Для защиты секретного ключа необходим пароль.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3829,7 +3829,7 @@ msgstr ""
"запустив данную программу с ключом \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3841,50 +3841,50 @@ msgstr ""
"обращения к дискам) в процессе генерации; это даст генератору\n"
"случайных чисел возможность получить лучшую энтропию.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "сохранение открытого ключа в `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "сохранение заглушки секретного ключа в `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "сохранение секретного ключа в `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "открытый и закрытый ключи созданы и подписаны.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -3892,45 +3892,45 @@ msgstr ""
"Учтите, что данный ключ не может использоваться для шифрования. Вы можете\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N)"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "сбой сохранения ключа на карту: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "не могу создать резервную копию, файл `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "ЗАМЕТЬТЕ: архивная копия ключа на карте сохранена в `%s'\n"
@@ -4263,109 +4263,109 @@ msgstr "оригинальное имя файла='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "проверка подписи подавлена\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "не могу обработать эти множественные подписи\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "Подпись сделана %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " ключом %s с ID %s\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Подпись создана %s ключом %s с ID %s\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Ключ доступен на:"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПЛОХАЯ подпись от \"%s\""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Просроченная подпись от \"%s\""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "Действительная подпись от \"%s\""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[сомнительно]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " aka \"%s\""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Подпись просрочена %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Подпись действительна до %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s подпись, хэш-функция %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "двоичный"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "текстовый"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "неизвестно"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не могу проверить подпись: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "не отделенная подпись\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"ВНИМАНИЕ: обнаружено множество подписей. Только первая будет проверена.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "самостоятельная подпись класса 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "старый (PGP 2.x) стиль подписи\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
@@ -4514,7 +4514,7 @@ msgstr ""
"ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
"симметричным шифром\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "подпакет типа %d имеет выставленный критический бит\n"
@@ -4809,56 +4809,61 @@ msgstr "ВНИМАНИЕ: Данный подключ был отозван ег
msgid "Note: This key has been disabled.\n"
msgstr "Замечание: Данный ключ отключен.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Замечание: Данный ключ просрочен!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "ВНИМАНИЕ: Данный ключ не заверен доверенной подписью!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Нет указаний на то, что подпись принадлежит владельцу.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ВНИМАНИЕ: НЕТ ДОВЕРИЯ данному ключу!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Возможно, что подпись ПОДДЕЛАНА.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ВНИМАНИЕ: Этот ключ не заверен достаточным количеством доверяемых подписей!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Нет уверенности в том, что подпись принадлежит владельцу.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: открытый ключ уже существует\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Не задан User ID. (можете использовать \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "Текущие получатели:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4866,33 +4871,33 @@ msgstr ""
"\n"
"Введите User ID. Пустая строка для завершения: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Нет такого User ID.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Открытый ключ отключен.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "пропущено: открытый ключ уже установлен\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "неизвестный получатель по умолчанию \"%s\"\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: открытый ключ отключен\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "нет действительных адресов\n"
diff --git a/po/sk.po b/po/sk.po
index 4b45aafc6..db673c600 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: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -29,7 +29,7 @@ msgstr "nebol detekovan iadny modul na zskanie entropie\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -65,8 +65,8 @@ msgstr "nemem ta `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "poznmka: sbor random_seed nie je aktualizovan\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -377,7 +377,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemono previes v dvkovom mde\n"
@@ -834,7 +834,7 @@ msgstr ""
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vyiadan symetrick ifra %s (%d) nevyhovuje predvobm prjemcu\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr ""
@@ -2853,20 +2853,20 @@ msgstr "podpisovanie zlyhalo: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Tento k nie je chrnen.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn asti primrneho ka nie s dostupn.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn asti primrneho ka nie s dostupn.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "k je chrnen.\n"
@@ -2883,7 +2883,7 @@ msgstr ""
"Vlote nov heslo (passphrase) pre tento tajn k.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nie je zopakovan sprvne; skste to znovu"
@@ -3332,13 +3332,13 @@ msgstr ""
"by sprvne, pokia znovu nespustte program.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[revokovan]"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3629,12 +3629,12 @@ msgstr "zapisujem podpis ka sebou samm\n"
msgid "writing key binding signature\n"
msgstr "zapisujem \"key-binding\" podpis\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn dka ka; pouijem %u bitov\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dka ka zaokrhlen na %u bitov\n"
@@ -3725,7 +3725,7 @@ msgstr " (%d) RSA (len na ifrovanie)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (len na ifrovanie)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "Pr kov DSA bude ma dku 1024 bitov.\n"
@@ -3833,7 +3833,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Je to sprvne (a/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3850,44 +3850,44 @@ msgstr ""
" \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Meno a priezvisko: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Neplatn znak ve mene\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Meno neme zana slicou\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Meno mus by dlh aspo 5 znakov\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "E-mailov adresa: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "Neplatn e-mailov adresa\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Komentr: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Neplatn znak v komentri\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pouvate znakov sadu `%s'.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3898,7 +3898,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do poa meno alebo komentr nepte, prosm, e-mailov adresu.\n"
@@ -3913,23 +3913,23 @@ msgstr "Do poa meno alebo komentr nepte, prosm, e-mailov adresu.\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "mMkKeEPpUu"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmeni (M)eno, (K)omentr, (E)-mail alebo (U)koni? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Zmeni (M)eno, (K)omentr, (E)-mail alebo (P)okraova/(U)koni? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Najskr, prosm, opravte chybu\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3937,12 +3937,12 @@ msgstr ""
"Na ochranu Vho tajnho ka muste zada heslo.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3954,7 +3954,7 @@ msgstr ""
"tohto programu s parametrom \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3966,50 +3966,50 @@ msgstr ""
"pouva disky); vaka tomu m genertor lepiu ancu zska dostatok "
"entropie.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Vytvranie ka bolo zruen.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisujem verejn k do `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenjden zapisovaten sbor verejnch kov (pubring): %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenjden zapisovaten sbor tajnch kov (secring): %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pri zpise do sboru verejnch kov `%s': %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pri zpise do sboru tajnch kov `%s': %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "verejn a tajn k boli vytvoren a podpsan.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4018,12 +4018,12 @@ msgstr ""
"Tento k neme by pouit na ifrovanie. Pre vytvorenie\n"
"sekundrneho ka na tento el mete poui prkaz \"--edit-key\".\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie ka sa nepodarilo: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4031,7 +4031,7 @@ msgstr ""
"k bol vytvoren %lu sekund v budcnosti (dolo k zmene asu alebo\n"
"je problm so systmovm asom)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4039,26 +4039,26 @@ msgstr ""
"k bol vytvoren %lu sekund v budcnosti (dolo k zmene asu alebo\n"
"je problm so systmovm asom)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZNMKA: vytvorenie podka pre ke v3 nie je v slade s OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skutone vytvori? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nemem vytvori `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "POZNMKA: platnos tajnho ka %08lX skonila %s\n"
@@ -4401,109 +4401,109 @@ msgstr ""
"samostatn revokan certifikt - pouite \"gpg --import\", ak ho chcete "
"vyui\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "verifikcia podpisu potlaen\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "neviem pracova s tmito nsobnmi podpismi\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Platnos podpisu vyprala %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu "ID" rein :-(
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Podpis vytvoren %.*s pomocou %s ka ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "K k dispozcii na: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ZL podpis od \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypranou platnosou od \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Dobr podpis od \""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[neist] "
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnos podpisu vyprala %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnos podpisu vypr %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s podpis, hashovac algoritmus %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binrne"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "textov md"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "neznme"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nemem overi podpis: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "toto nie je podpis oddelen od dokumentu\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "VAROVANIE: Njden viacnsobne podpisy. Skontrolovan bude len prv.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatn podpis triedy 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starho typu (PGP 2.x)\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "njden neplatn koreov paket v proc_tree()\n"
@@ -4650,7 +4650,7 @@ msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"VAROVANIE: pravdepodobne nebezpen symetricky ifrovan k sedenia\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m nastaven kritick bit\n"
@@ -4952,59 +4952,64 @@ msgstr "VAROVANIE: Tento podk bol revokovan jeho vlastnkom!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Poznmka: Tento k bol oznaen ako neplatn (disabled).\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Poznmka: Skonila platnos tohto ka!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "VAROVANIE: Tento k nie certifikovan dveryhodnm podpisom!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Ni nenaznauje tomu, e tento podpis patr vlastnkovi ka.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VAROVANIE: NEdverujeme tomuto ku!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Tento podpis je pravdepodobne FALON.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"VAROVANIE: Tento k nie je certifikovan dostatone dveryhodnmi "
"podpismi!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nie je ist, e tento podpis patr vlastnkovi.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: preskoen: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: preskoen: verejn k je u obsiahnut v databze\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Nepecifikovali ste identifiktor uvatea (user ID). Mete poui \"-r\"\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5012,33 +5017,33 @@ msgstr ""
"\n"
"Napte identifiktor uvatea (user ID). Ukonite przdnym riadkom: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Takto identifiktor uvatea neexistuje.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "preskoen: verejn k je u nastaven poda implicitnho adresta\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Verejn k je neplatn (disabled).\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "preskoen: verejn k je u nastaven\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "neznmy implicitn adrest `%s'\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: preskoen: verejn k je neplatn (disabled)\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "iadne platn adresy\n"
diff --git a/po/sv.po b/po/sv.po
index e6c35a6d1..9822d31bd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.6\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2004-12-01 17:49+0100\n"
"Last-Translator: Per Tunedal <info@clipanish.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -47,7 +47,7 @@ msgstr "ingen demon för entropisamling hittad\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -83,8 +83,8 @@ msgstr "kan inte läsa \"%s\": %s\n"
msgid "note: random_seed file not updated\n"
msgstr "Obs: random_seed uppdaterades inte\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -402,7 +402,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i batch-läge\n"
@@ -864,7 +864,7 @@ msgstr ""
"att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
"inställningar\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "du kan inte använda %s när du är i %s läge\n"
@@ -2926,20 +2926,20 @@ msgstr "signeringen misslyckades: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Denna nyckel är inte skyddad.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Nyckeln är skyddad.\n"
@@ -2956,7 +2956,7 @@ msgstr ""
"Skriv in den nya lösenmening för denna hemliga nyckel.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "lösenmeningen upprepades inte korrekt; försök igen."
@@ -3410,13 +3410,13 @@ msgstr ""
"om du inte startar om programmet.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
#, fuzzy
msgid "revoked"
msgstr "[spärrad]"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
#, fuzzy
msgid "expired"
msgstr "expire"
@@ -3719,12 +3719,12 @@ msgstr "skriver egensignatur\n"
msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "felaktig nyckelstorlek; använder %u bitar\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@ -3815,7 +3815,7 @@ msgstr " (%d) RSA (endast kryptering)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (endast kryptering)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
@@ -3925,7 +3925,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Stämmer detta (j/n)? "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
#, fuzzy
msgid ""
"\n"
@@ -3942,44 +3942,44 @@ msgstr ""
" \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Namn: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Felaktigt tecken i namnet\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Namnet får inte börja med en siffra\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "E-postadress: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "E-postadressen är ogiltig\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Felaktigt tecken i kommentaren\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du använder teckenuppsättningen \"%s\"\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3990,7 +3990,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Ange inte e-postadressen som namn eller kommentar\n"
@@ -4006,24 +4006,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Rätta först felet\n"
# fel kapitalisering i originalet?
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4031,12 +4031,12 @@ msgstr ""
"Du behöver en lösenmening för att skydda din hemliga nyckel\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4047,7 +4047,7 @@ msgstr ""
"Jag kommer att göra det ändå. Du kan ändra din lösenmening när som helst\n"
"om du använder detta program med flaggan \"--edit-key\".\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4059,50 +4059,50 @@ msgstr ""
"hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en större chans att samla ihop en tillräcklig mängd entropi.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver den öppna nyckeln till \"%s\"\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "hittade ingen öppen nyckelring att skriva till: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fel vid skrivning av öppna nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "den öppna och den hemliga nyckeln är skapade och signerade.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4112,13 +4112,13 @@ msgstr ""
"kanske att vilja använda kommandot \"--edit-key\" för att skapa en\n"
"undernyckel för detta syfte.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
# c-format behövs inte i singularis
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4126,7 +4126,7 @@ msgstr ""
"nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4134,26 +4134,26 @@ msgstr ""
"nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Vill du verkligen skapa? "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "misslyckades med att radera nyckelblock: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan inte skapa \"%s\": %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -4498,112 +4498,112 @@ msgstr ""
"fristående spärrcertifikat - använd \"gpg --import\" för\n"
"att applicera\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "signaturen verifierades inte\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "kan inte hantera dessa multipla signaturer\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Giltighetstiden för signaturen har upphört %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " även känd som \""
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, fuzzy, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Nyckeln tillgänglig hos: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "FELAKTIG signatur från \""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Giltighetstiden har upphört för signatur från \""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekt signatur från \""
# Visas vid ogiltig signatur:
# Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[osäkert]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " även känd som \""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Giltighetstiden för signaturen har upphört %s\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Giltighetstiden för signaturen går ut %s\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s signatur, sammandragsalgoritm %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "binär"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "textläge"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "okänd"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan inte verifiera signaturen: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "detta är inte någon signatur i en separat fil\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"VARNING: multipla signaturer upptäckta. Endast den första kommer att "
"kontrolleras.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "fristående signatur av klassen 0x%02x\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "signatur av den gamla (PGP 2.x) typen\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "felaktigt rotpaket hittades i proc_tree()\n"
@@ -4748,7 +4748,7 @@ msgstr "kan inte hantera algoritm %d för öppna nycklar\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
@@ -5056,60 +5056,65 @@ msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
msgid "Note: This key has been disabled.\n"
msgstr "Obs: Denna nyckel har stängts av.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Det finns inget som indikerar att signaturen tillhör ägaren.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen är sannolikt en FÖRFALSKNING.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
"tillräckligt högt tillitsvärde!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Det är inte säkert att signaturen tillhör ägaren.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppade över: %s\n"
# överhoppad?
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "hoppade över %s: öppen nyckel finns redan\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Du specificerade ingen användaridentitet. (du kan använda \"-r\") för detta\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr ""
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5117,28 +5122,28 @@ msgstr ""
"\n"
"Skriv användar-ID. Avsluta med en tom rad: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Hittade inte användaridentiteten.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "hoppade över: den öppna nyckeln är redan satt som förvald mottagare\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Den öppna nyckeln är avstängd.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "hoppade över: öppen nyckel redan angiven\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "den förvalda mottagaren \"%s\" är okänd\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "hoppade över %s: den öppna nyckeln är avstängd\n"
@@ -5146,7 +5151,7 @@ msgstr "hoppade över %s: den öppna nyckeln är avstängd\n"
# plural av adressee
# dvs. den som meddelandet är adresserat till.
# Åtskillnad görs mellan adressee och receiver.
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "inga giltiga adressater\n"
diff --git a/po/tr.po b/po/tr.po
index 1e03886f1..2fe465629 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2005-03-16 07:30+0300\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@ msgstr "rasgele bayt elde etme modülü bulunamadı\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,8 +67,8 @@ msgstr "\"%s\" okunamıyor: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -374,7 +374,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "%s numaralı OpenPGP kartı saptandı\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
@@ -809,7 +809,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
@@ -2770,19 +2770,19 @@ msgstr ""
"Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
"değiştirilecek bir anahtar parolası yok.\n"
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "Bu anahtar korunmamış.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "Anahtar korunmuş.\n"
@@ -2799,7 +2799,7 @@ msgstr ""
"Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr ""
"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -3238,12 +3238,12 @@ msgstr ""
"doğrulukta olmayacağını lütfen gözönüne alınız.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "yürürlükten kaldırıldı"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "zamanaşımına uğradı"
@@ -3539,12 +3539,12 @@ msgstr "öz-imza yazılıyor\n"
msgid "writing key binding signature\n"
msgstr "anahtarı garantileyen imzayı yazıyor\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -3633,7 +3633,7 @@ msgstr " (%d) RSA (sadece şifrelemek için)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (yeteneklerini belirtin)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA anahtar çifti %u bit olacak.\n"
@@ -3738,7 +3738,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Bu doğru mu? (e/H ya da y/N) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3754,44 +3754,44 @@ msgstr ""
"\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "Adınız ve Soyadınız: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "Ad ve soyadınızda geçersiz karakter var\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "E-posta adresiniz: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "geçerli bir E-posta adresi değil\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "Önbilgi: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "Önbilgi alanında geçersiz karakter var\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3802,7 +3802,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -3818,24 +3818,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "AaYyEeTtKk"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "Lütfen önce hatayı düzeltin\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3843,12 +3843,12 @@ msgstr ""
"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3860,7 +3860,7 @@ msgstr ""
"seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3873,50 +3873,50 @@ msgstr ""
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "genel anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gizli anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -3924,19 +3924,19 @@ msgstr ""
"Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
"\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3944,26 +3944,26 @@ msgstr ""
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -4296,108 +4296,108 @@ msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "imza doğrulama engellendi\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "bu çoklu imzalar elde edilemiyor\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "İmza %s de\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " %s kullanılarak anahtar %s ile yapılmış\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "Anahtar burada:"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\" deki imza KÖTÜ"
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\" deki imza zamanaşımına uğramış"
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\" deki imza iyi"
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[şüpheli]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " nam-ı diğer \"%s\""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "Bu imzanın geçerliliği %s de bitti.\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s imzası, %s özümleme algoritması\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "ikili"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "metinkipi"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "bilinmeyen"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "İmza kontrol edilemedi: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "bir bağımsız imza değil\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x sınıfı tek başına imza\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "eski stil (PGP 2.x) imza\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
@@ -4543,7 +4543,7 @@ msgstr "%d genel anahtar algoritması kullanılamadı\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -4838,57 +4838,62 @@ msgstr ""
msgid "Note: This key has been disabled.\n"
msgstr "Bilgi: Bu anahtar iptal edildi.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " Bu imza SAHTE olabilir.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
"sertifikalanmamış!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Bu imzanın sahibine ait olduğu kesin değil.\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: atlandı: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: atlandı: genel anahtar zaten var\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "Şimdiki alıcılar:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4896,33 +4901,33 @@ msgstr ""
"\n"
"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "Böyle bir kullanıcı kimliği yok.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "Genel anahtar iptal edildi.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: atlandı: genel anahtar iptal edildi\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "geçerli adresler yok\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1b7da7112..a14e61b6d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2005-03-17 22:24+0800\n"
"Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -35,7 +35,7 @@ msgstr "检测不到熵搜集模块\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -71,8 +71,8 @@ msgstr "无法读取‘%s’:%s\n"
msgid "note: random_seed file not updated\n"
msgstr "注意:随机数种子文件未被更新\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -374,7 +374,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@ -800,7 +800,7 @@ msgstr "警告:强行使用的 %s (%d)压缩算法不在收件者的首选项
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
@@ -2716,19 +2716,19 @@ msgstr "签字时失败: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -2745,7 +2745,7 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符;请再试一次"
@@ -3156,12 +3156,12 @@ msgid ""
msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "已吊销"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "已过期"
@@ -3445,12 +3445,12 @@ msgstr "正在写入自身签字\n"
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签字\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效:改用 %u 位\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
@@ -3539,7 +3539,7 @@ msgstr " (%d) RSA (仅用于加密)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA 密钥对会有 %u 位。\n"
@@ -3644,7 +3644,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "以上正确吗?(y/n)"
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3660,44 +3660,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "真实姓名:"
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "电子邮件地址:"
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "注释:"
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3708,7 +3708,7 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@ -3723,23 +3723,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3747,12 +3747,12 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3764,7 +3764,7 @@ msgstr ""
"再次执行这个程序,并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3774,50 +3774,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环:%s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签字。\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -3825,42 +3825,42 @@ msgstr ""
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败:%s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意:卡密钥的备份已保存到‘%s’\n"
@@ -4190,108 +4190,108 @@ msgstr "原始文件名 =‘%.*s’\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "签字验证已被抑制\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "无法处理这些多重签字\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "签字建立于 %s\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签字,使用 %s,钥匙号 %s\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "可用的密钥在:"
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签字,来自于“%s”"
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签字,来自于“%s”"
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签字,来自于“%s”"
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[不确定]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签字已于 %s 过期。\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签字在 %s 过期。\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 签字,散列算法 %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "二进制"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "文本模式"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签字:%s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "不是一份分离的签字\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告:检测到多重签字。只检查第一个签字。\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签字\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签字\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中检测到无效的根包\n"
@@ -4433,7 +4433,7 @@ msgstr "无法操作公钥算法 %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告:潜在不安全的对称加密会话密钥\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
@@ -4715,55 +4715,60 @@ msgstr "警告:这把子钥已经被它的持有者吊销了!\n"
msgid "Note: This key has been disabled.\n"
msgstr "注意:这把密钥已经被禁用了。\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "注意:这把密钥已经过期了!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告:这把密钥未经受信任的签字认证!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 没有证据表明这个签字属于它所声称的持有者。\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告:我们不信任这把密钥!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " 这个签字很有可能是伪造的。\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告:这把密钥未经有足够信任度的签字所认证。\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签字并不一定属于它所声称的持有者\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s:已跳过:%s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过:公钥已存在\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "当前收件人:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4771,33 +4776,33 @@ msgstr ""
"\n"
"输入用户标识。以空白行结束:"
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过:公钥已被设为默认收件者\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "已跳过:公钥已被设定\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s:已跳过:公钥已被禁用\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bc23cb462..cb5b13060 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2\n"
"Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2005-07-27 19:41+0200\n"
+"POT-Creation-Date: 2005-07-28 21:11+0200\n"
"PO-Revision-Date: 2005-06-23 02:36+0800\n"
"Last-Translator: Jedi <Jedi@Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -33,7 +33,7 @@ msgstr "偵測不到亂數蒐集模組\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2252
+#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -69,8 +69,8 @@ msgstr "無法讀取 `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "請注意: random_seed 檔案未被更新\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2731
-#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
+#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
@@ -372,7 +372,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1513
-#: g10/keygen.c:2436 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
@@ -798,7 +798,7 @@ msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
-#: g10/encode.c:795 g10/pkclist.c:722 g10/pkclist.c:758
+#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "妳不能夠將 %s 用於 %s 模式中\n"
@@ -2726,19 +2726,19 @@ msgstr "簽署時失敗了: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
-#: g10/keyedit.c:1138 g10/keygen.c:3065
+#: g10/keyedit.c:1138 g10/keygen.c:3044
msgid "This key is not protected.\n"
msgstr "這把金鑰沒有被保護.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3053
+#: g10/keyedit.c:1142 g10/keygen.c:3032
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分沒辦法取用.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3068
+#: g10/keyedit.c:1146 g10/keygen.c:3047
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3072
+#: g10/keyedit.c:1150 g10/keygen.c:3051
msgid "Key is protected.\n"
msgstr "金鑰被保護了.\n"
@@ -2755,7 +2755,7 @@ msgstr ""
"輸入要給這把私鑰用的新密語.\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1828
+#: g10/keyedit.c:1189 g10/keygen.c:1807
msgid "passphrase not correctly repeated; try again"
msgstr "密語再次輸入時沒有正確重複; 請再試一次"
@@ -3170,12 +3170,12 @@ msgstr ""
"除非妳重新執行程式.\n"
#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "已撤銷"
#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "已過期"
@@ -3456,12 +3456,12 @@ msgstr "正在寫入自我簽章\n"
msgid "writing key binding signature\n"
msgstr "正在寫入附鑰簽章\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2629
+#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "金鑰尺寸無效; 改用 %u 位元\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2635
+#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -3550,7 +3550,7 @@ msgstr " (%d) RSA (僅能加密用)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (妳自己設定性能)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2506
+#: g10/keygen.c:1421 g10/keygen.c:2485
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA 金鑰對會有 %u 位元長.\n"
@@ -3655,7 +3655,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "以上正確嗎? (y/N) "
-#: g10/keygen.c:1641
+#: g10/keygen.c:1620
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3670,44 +3670,44 @@ msgstr ""
" \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
"\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1633
msgid "Real name: "
msgstr "真實姓名: "
-#: g10/keygen.c:1662
+#: g10/keygen.c:1641
msgid "Invalid character in name\n"
msgstr "姓名含有無效的字符\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1643
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用數字開頭\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1645
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五個字符長\n"
-#: g10/keygen.c:1674
+#: g10/keygen.c:1653
msgid "Email address: "
msgstr "電子郵件地址: "
-#: g10/keygen.c:1685
+#: g10/keygen.c:1664
msgid "Not a valid email address\n"
msgstr "不是有效的電子郵件地址\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1672
msgid "Comment: "
msgstr "註釋: "
-#: g10/keygen.c:1699
+#: g10/keygen.c:1678
msgid "Invalid character in comment\n"
msgstr "註釋含有無效的字符\n"
-#: g10/keygen.c:1722
+#: g10/keygen.c:1701
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "妳正在使用 `%s' 字元集.\n"
-#: g10/keygen.c:1728
+#: g10/keygen.c:1707
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3718,7 +3718,7 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1733
+#: g10/keygen.c:1712
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
@@ -3733,23 +3733,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1749
+#: g10/keygen.c:1728
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1759
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
-#: g10/keygen.c:1760
+#: g10/keygen.c:1739
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
-#: g10/keygen.c:1779
+#: g10/keygen.c:1758
msgid "Please correct the error first\n"
msgstr "請先訂正錯誤\n"
-#: g10/keygen.c:1819
+#: g10/keygen.c:1798
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3757,12 +3757,12 @@ msgstr ""
"妳需要一個密語來保護妳的私鑰.\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:804
+#: g10/keygen.c:1808 g10/passphrase.c:804
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1814
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -3774,7 +3774,7 @@ msgstr ""
"僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
"\n"
-#: g10/keygen.c:1857
+#: g10/keygen.c:1836
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -3785,50 +3785,50 @@ msgstr ""
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
-#: g10/keygen.c:2575
+#: g10/keygen.c:2554
msgid "Key generation canceled.\n"
msgstr "已取消金鑰產生.\n"
-#: g10/keygen.c:2774 g10/keygen.c:2918
+#: g10/keygen.c:2753 g10/keygen.c:2897
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在將公鑰寫至 `%s'\n"
-#: g10/keygen.c:2776 g10/keygen.c:2921
+#: g10/keygen.c:2755 g10/keygen.c:2900
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "正在寫入私鑰 stub 至 `%s'\n"
-#: g10/keygen.c:2779 g10/keygen.c:2924
+#: g10/keygen.c:2758 g10/keygen.c:2903
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在將私鑰寫至 `%s'\n"
-#: g10/keygen.c:2907
+#: g10/keygen.c:2886
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
-#: g10/keygen.c:2913
+#: g10/keygen.c:2892
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
-#: g10/keygen.c:2931
+#: g10/keygen.c:2910
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
-#: g10/keygen.c:2938
+#: g10/keygen.c:2917
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
-#: g10/keygen.c:2961
+#: g10/keygen.c:2940
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已經被建立及簽署了.\n"
-#: g10/keygen.c:2972
+#: g10/keygen.c:2951
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -3836,42 +3836,42 @@ msgstr ""
"請注意這把金鑰不能用於加密之用. 也許妳會想藉由 \"--edit-key\" \n"
"指令來產生加密用的次鑰.\n"
-#: g10/keygen.c:2984 g10/keygen.c:3113 g10/keygen.c:3228
+#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
-#: g10/keygen.c:3036 g10/keygen.c:3164 g10/sign.c:291
+#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
-#: g10/keygen.c:3038 g10/keygen.c:3166 g10/sign.c:293
+#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
-#: g10/keygen.c:3047 g10/keygen.c:3177
+#: g10/keygen.c:3026 g10/keygen.c:3156
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
-#: g10/keygen.c:3086 g10/keygen.c:3210
+#: g10/keygen.c:3065 g10/keygen.c:3189
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
-#: g10/keygen.c:3363
+#: g10/keygen.c:3342
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "儲存金鑰到卡片上時失敗: %s\n"
-#: g10/keygen.c:3410
+#: g10/keygen.c:3389
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "無法建立備份檔案 `%s': %s\n"
-#: g10/keygen.c:3436
+#: g10/keygen.c:3415
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -4201,108 +4201,108 @@ msgstr "原始的檔名 ='%.*s'\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
-#: g10/mainproc.c:1307
+#: g10/mainproc.c:1387
msgid "signature verification suppressed\n"
msgstr "簽章驗證已被抑制\n"
-#: g10/mainproc.c:1349 g10/mainproc.c:1359
+#: g10/mainproc.c:1429 g10/mainproc.c:1439
msgid "can't handle these multiple signatures\n"
msgstr "無法處理這些多重簽章\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1449
#, c-format
msgid "Signature made %s\n"
msgstr "由 %s 建立的簽章\n"
-#: g10/mainproc.c:1370
+#: g10/mainproc.c:1450
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 金鑰 %s\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1454
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
-#: g10/mainproc.c:1394
+#: g10/mainproc.c:1474
msgid "Key available at: "
msgstr "可用的金鑰於: "
-#: g10/mainproc.c:1499 g10/mainproc.c:1547
+#: g10/mainproc.c:1605 g10/mainproc.c:1653
#, c-format
msgid "BAD signature from \"%s\""
msgstr "*損壞* 的簽章來自於 \"%s\""
-#: g10/mainproc.c:1501 g10/mainproc.c:1549
+#: g10/mainproc.c:1607 g10/mainproc.c:1655
#, c-format
msgid "Expired signature from \"%s\""
msgstr "過期的簽章來自於 \"%s\""
-#: g10/mainproc.c:1503 g10/mainproc.c:1551
+#: g10/mainproc.c:1609 g10/mainproc.c:1657
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的簽章來自於 \"%s\""
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1661
msgid "[uncertain]"
msgstr "[ 不確定 ]"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1693
#, c-format
msgid " aka \"%s\""
msgstr " 亦即 \"%s\""
-#: g10/mainproc.c:1681
+#: g10/mainproc.c:1790
#, c-format
msgid "Signature expired %s\n"
msgstr "這份簽署已經在 %s 過期了\n"
-#: g10/mainproc.c:1686
+#: g10/mainproc.c:1795
#, c-format
msgid "Signature expires %s\n"
msgstr "這份簽署在 %s 過期\n"
-#: g10/mainproc.c:1689
+#: g10/mainproc.c:1798
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 簽章, 摘要演算法 %s\n"
-#: g10/mainproc.c:1690
+#: g10/mainproc.c:1799
msgid "binary"
msgstr "二進制"
-#: g10/mainproc.c:1691
+#: g10/mainproc.c:1800
msgid "textmode"
msgstr "文字模式"
-#: g10/mainproc.c:1691 g10/trustdb.c:531
+#: g10/mainproc.c:1800 g10/trustdb.c:531
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1820
#, c-format
msgid "Can't check signature: %s\n"
msgstr "無法檢查簽章: %s\n"
-#: g10/mainproc.c:1779 g10/mainproc.c:1795 g10/mainproc.c:1881
+#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
msgid "not a detached signature\n"
msgstr "不是一份分離的簽章\n"
-#: g10/mainproc.c:1822
+#: g10/mainproc.c:1931
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
-#: g10/mainproc.c:1830
+#: g10/mainproc.c:1939
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等級 0x%02x 的獨立簽章\n"
-#: g10/mainproc.c:1887
+#: g10/mainproc.c:1996
msgid "old style (PGP 2.x) signature\n"
msgstr "舊型 (PGP 2.x) 簽章\n"
-#: g10/mainproc.c:1897
+#: g10/mainproc.c:2006
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
@@ -4444,7 +4444,7 @@ msgstr "無法操作公開金鑰演算法 %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
-#: g10/parse-packet.c:1145
+#: g10/parse-packet.c:1147
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 類別的子封包設定了關鍵位元\n"
@@ -4730,55 +4730,60 @@ msgstr "警告: 這把子鑰已經被它的持有人撤銷了!\n"
msgid "Note: This key has been disabled.\n"
msgstr "請注意: 這把金鑰已經被禁用了.\n"
-#: g10/pkclist.c:538
+#: g10/pkclist.c:543
+#, c-format
+msgid "Note: Verified address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "請注意: 這把金鑰已經過期了!\n"
-#: g10/pkclist.c:549
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
-#: g10/pkclist.c:551
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 沒有證據指出這個簽章屬於這個持有者.\n"
-#: g10/pkclist.c:559
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告: 我們 *不* 信任這把金鑰!\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " 這個簽章很有可能是 *偽造的*.\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
-#: g10/pkclist.c:570
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 這份簽章並不屬於這個持有者\n"
-#: g10/pkclist.c:735 g10/pkclist.c:768 g10/pkclist.c:937 g10/pkclist.c:997
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: 已跳過: %s\n"
-#: g10/pkclist.c:745 g10/pkclist.c:969
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳過: 公鑰已經存在了\n"
-#: g10/pkclist.c:787
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "妳沒有指定一個使用者 ID. (妳可能得用 \"-r\")\n"
-#: g10/pkclist.c:803
+#: g10/pkclist.c:845
msgid "Current recipients:\n"
msgstr "目前的收件者:\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4786,33 +4791,33 @@ msgstr ""
"\n"
"輸入使用者 ID. 以空白列結束: "
-#: g10/pkclist.c:845
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "沒有這個使用者 ID.\n"
-#: g10/pkclist.c:850 g10/pkclist.c:912
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳過: 公鑰已經被設成預設收件者\n"
-#: g10/pkclist.c:868
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "公鑰被禁用了.\n"
-#: g10/pkclist.c:875
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "已跳過: 公鑰已經被設過了\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的預設收件者 \"%s\"\n"
-#: g10/pkclist.c:949
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: 已跳過: 公鑰已經被禁用了\n"
-#: g10/pkclist.c:1004
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "沒有有效的地址\n"
diff --git a/util/ChangeLog b/util/ChangeLog
index be2e764fa..e4e8a83f0 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-22 Werner Koch <wk@g10code.com>
+
+ * iobuf.c (iobuf_get_filelength): New arg OVERFLOW.
+ (iobuf_get_filelength) [W32]: Use GetFileSizeEx if available.
+ * fileutil.c (is_file_compressed): Take care of the OVERFLOW
+
2005-08-31 David Shaw <dshaw@jabberwocky.com>
* fileutil.c (untilde): New. Expand ~/foo and ~username/foo
diff --git a/util/fileutil.c b/util/fileutil.c
index c956b4fec..5834e3d89 100644
--- a/util/fileutil.c
+++ b/util/fileutil.c
@@ -253,6 +253,7 @@ is_file_compressed( const char *s, int *ret_rc )
IOBUF a;
byte buf[4];
int i, rc = 0;
+ int overflow;
struct magic_compress_s {
size_t len;
@@ -272,7 +273,7 @@ is_file_compressed( const char *s, int *ret_rc )
return 0;
}
- if ( iobuf_get_filelength( a ) < 4 ) {
+ if ( iobuf_get_filelength( a, &overflow ) < 4 && !overflow) {
*ret_rc = 0;
goto leave;
}
diff --git a/util/iobuf.c b/util/iobuf.c
index 2c6259449..0f534fadf 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -41,6 +41,7 @@
#include "memory.h"
#include "util.h"
+#include "dynload.h"
#include "iobuf.h"
#undef FILE_FILTER_USES_STDIO
@@ -1830,14 +1831,17 @@ iobuf_set_limit( IOBUF a, off_t nlimit )
-/****************
- * Return the length of an open file
- */
+/* Return the length of an open file A. IF OVERFLOW is not NULL it
+ will be set to true if the file is larger than what off_t can cope
+ with. The function return 0 on error or on overflow condition. */
off_t
-iobuf_get_filelength( IOBUF a )
+iobuf_get_filelength (IOBUF a, int *overflow )
{
struct stat st;
+ if (overflow)
+ *overflow = 0;
+
if( a->directfp ) {
FILE *fp = a->directfp;
@@ -1855,9 +1859,46 @@ iobuf_get_filelength( IOBUF a )
#if defined(HAVE_DOSISH_SYSTEM) && !defined(FILE_FILTER_USES_STDIO)
ulong size;
-
- if ((size=GetFileSize (fp, NULL)) != 0xffffffff)
- return size;
+ static int (* __stdcall get_file_size_ex)
+ (void *handle, LARGE_INTEGER *size);
+ static int get_file_size_ex_initialized;
+
+ if (!get_file_size_ex_initialized)
+ {
+ void *handle;
+
+ handle = dlopen ("kernel32.dll", RTLD_LAZY);
+ if (handle)
+ {
+ get_file_size_ex = dlsym (handle, "GetFileSizeEx");
+ if (!get_file_size_ex)
+ dlclose (handle);
+ }
+ get_file_size_ex_initialized = 1;
+ }
+
+ if (get_file_size_ex)
+ {
+ /* This is a newer system with GetFileSizeEx; we use
+ this then becuase it seem that GetFileSize won't
+ return a proper error in case a file is larger than
+ 4GB. */
+ LARGE_INTEGER size;
+
+ if (get_file_size_ex (fp, &size))
+ {
+ if (!size.u.HighPart)
+ return size.u.LowPart;
+ if (overflow)
+ *overflow = 1;
+ return 0;
+ }
+ }
+ else
+ {
+ if ((size=GetFileSize (fp, NULL)) != 0xffffffff)
+ return size;
+ }
log_error ("GetFileSize for handle %p failed: %s\n",
fp, w32_strerror (0));
#else