summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/ChangeLog9
-rw-r--r--g10/Makefile.am2
-rw-r--r--g10/keyedit.c2
-rw-r--r--g10/keygen.c72
-rw-r--r--g10/packet.h2
-rw-r--r--g10/photoid.c3
-rw-r--r--po/be.po122
-rw-r--r--po/ca.po122
-rw-r--r--po/cs.po122
-rw-r--r--po/da.po122
-rw-r--r--po/de.po124
-rw-r--r--po/el.po122
-rw-r--r--po/eo.po122
-rw-r--r--po/es.po122
-rw-r--r--po/et.po122
-rw-r--r--po/fi.po122
-rw-r--r--po/fr.po122
-rw-r--r--po/gl.po122
-rw-r--r--po/hu.po122
-rw-r--r--po/id.po122
-rw-r--r--po/it.po122
-rw-r--r--po/ja.po122
-rw-r--r--po/nb.po122
-rw-r--r--po/pl.po122
-rw-r--r--po/pt.po122
-rw-r--r--po/pt_BR.po122
-rw-r--r--po/ro.po122
-rw-r--r--po/ru.po122
-rw-r--r--po/sk.po122
-rw-r--r--po/sv.po122
-rw-r--r--po/tr.po122
-rw-r--r--po/zh_CN.po122
-rw-r--r--po/zh_TW.po122
33 files changed, 1767 insertions, 1619 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 9d77b7d6e..0b151f554 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,14 @@
2009-09-03 Werner Koch <wk@g10code.com>
+ * keyedit.c (menu_adduid): Pass keyblock to generate_user_id.
+ * keygen.c (generate_user_id): Add arg KEYBLOCK. Factor code out
+ to ...
+ (uid_from_string): ... new.
+ (ask_user_id): Add arg KEYBLOCK and check for duplicates. Fix
+ bug#1122.
+
+ * Makefile.am (uninstall-local): New.
+
* compress-bz2.c (do_uncompress): Detect unexpected EOF. Fix
bug#1011.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 9c829fa24..3c85bbe6f 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -137,3 +137,5 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/options.skel \
$(DESTDIR)$(pkgdatadir)/gpg-conf.skel
+uninstall-local:
+ -@rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 3454189f2..3e6b966b9 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -3073,7 +3073,7 @@ menu_adduid( KBNODE pub_keyblock, KBNODE sec_keyblock,
uid = generate_photo_id(pk,photo_name);
} else
- uid = generate_user_id();
+ uid = generate_user_id (pub_keyblock);
if( !uid )
return 0;
diff --git a/g10/keygen.c b/g10/keygen.c
index 38d78073f..3abc19bd0 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2017,8 +2017,28 @@ ask_expiredate()
}
+
+static PKT_user_id *
+uid_from_string (const char *string)
+{
+ size_t n;
+ PKT_user_id *uid;
+
+ n = strlen (string);
+ uid = xmalloc_clear (sizeof *uid + n);
+ uid->len = n;
+ strcpy (uid->name, string);
+ uid->ref = 1;
+ return uid;
+}
+
+
+/* Ask for a user ID. With a MODE of 1 an extra help prompt is
+ printed for use during a new key creation. If KEYBLOCK is not NULL
+ the function prevents the creation of an already existing user
+ ID. */
static char *
-ask_user_id( int mode )
+ask_user_id (int mode, KBNODE keyblock)
{
char *answer;
char *aname, *acomment, *amail, *uid;
@@ -2134,14 +2154,29 @@ ask_user_id( int mode )
}
tty_printf(_("You selected this USER-ID:\n \"%s\"\n\n"), uid);
- /* fixme: add a warning if this user-id already exists */
+
if( !*amail && !opt.allow_freeform_uid
&& (strchr( aname, '@' ) || strchr( acomment, '@'))) {
fail = 1;
- tty_printf(_("Please don't put the email address "
- "into the real name or the comment\n") );
+ tty_printf(_("Please don't put the email address "
+ "into the real name or the comment\n") );
}
+ if (!fail && keyblock)
+ {
+ PKT_user_id *uidpkt = uid_from_string (uid);
+ KBNODE node;
+
+ for (node=keyblock; node && !fail; node=node->next)
+ if (!is_deleted_kbnode (node)
+ && node->pkt->pkttype == PKT_USER_ID
+ && !cmp_user_ids (uidpkt, node->pkt->pkt.user_id))
+ fail = 1;
+ if (fail)
+ tty_printf (_("Such a user ID already exists on this key!\n"));
+ free_user_id (uidpkt);
+ }
+
for(;;) {
/* TRANSLATORS: These are the allowed answers in
lower and uppercase. Below you will find the matching
@@ -2296,25 +2331,18 @@ do_create (int algo, unsigned int nbits, KBNODE pub_root, KBNODE sec_root,
}
-/****************
- * Generate a new user id packet, or return NULL if canceled
- */
+/* Generate a new user id packet or return NULL if canceled. If
+ KEYBLOCK is not NULL the function prevents the creation of an
+ already existing user ID. */
PKT_user_id *
-generate_user_id()
+generate_user_id (KBNODE keyblock)
{
- PKT_user_id *uid;
- char *p;
- size_t n;
-
- p = ask_user_id( 1 );
- if( !p )
- return NULL;
- n = strlen(p);
- uid = xmalloc_clear( sizeof *uid + n );
- uid->len = n;
- strcpy(uid->name, p);
- uid->ref = 1;
- return uid;
+ char *p;
+
+ p = ask_user_id (1, keyblock);
+ if (!p)
+ return NULL; /* Canceled. */
+ return uid_from_string (p);
}
@@ -3143,7 +3171,7 @@ generate_keypair (const char *fname, const char *card_serialno,
r->next = para;
para = r;
- uid = ask_user_id(0);
+ uid = ask_user_id (0, NULL);
if( !uid )
{
log_error(_("Key generation canceled.\n"));
diff --git a/g10/packet.h b/g10/packet.h
index 9651ba4b0..cb2f0c9f1 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -509,6 +509,6 @@ int update_keysig_packet( PKT_signature **ret_sig,
void *opaque );
/*-- keygen.c --*/
-PKT_user_id *generate_user_id(void);
+PKT_user_id *generate_user_id (KBNODE keyblock);
#endif /*G10_PACKET_H*/
diff --git a/g10/photoid.c b/g10/photoid.c
index 80a60635d..8aa4ad491 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -42,7 +42,8 @@
#include "ttyio.h"
#include "trustdb.h"
-/* Generate a new photo id packet, or return NULL if canceled */
+/* Generate a new photo id packet, or return NULL if canceled.
+ FIXME: Should we add a duplicates check similar to generate_user_id? */
PKT_user_id *
generate_photo_id(PKT_public_key *pk,const char *photo_name)
{
diff --git a/po/be.po b/po/be.po
index a93ada0e3..106cef068 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -92,7 +92,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -101,7 +101,7 @@ msgstr ""
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1207,7 +1207,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr ""
@@ -3394,20 +3394,20 @@ msgstr "збой падпісаньня: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr ""
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr ""
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "сакрэтны ключ недаступны"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Ключ абаронены.\n"
@@ -3424,7 +3424,7 @@ msgstr ""
"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr ""
@@ -4187,13 +4187,13 @@ msgid "writing key binding signature\n"
msgstr ""
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr ""
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr ""
@@ -4388,7 +4388,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr ""
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4399,7 +4399,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4409,44 +4409,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr ""
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr ""
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr ""
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr ""
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr ""
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr ""
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr ""
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr ""
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr ""
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4454,10 +4454,14 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4469,29 +4473,29 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr ""
-#: g10/keygen.c:2168
+#: g10/keygen.c:2203
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
-#: g10/keygen.c:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@ -4500,12 +4504,12 @@ msgstr ""
"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
"\n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4513,7 +4517,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4521,91 +4525,91 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr ""
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr ""
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "запіс у stdout\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr ""
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr ""
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr ""
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -5302,7 +5306,7 @@ msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5311,34 +5315,34 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr ""
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr ""
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr ""
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 2c0d4db84..3e2e63865 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -114,7 +114,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritme de protecció %d%s no està suportat\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -123,7 +123,7 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1279,7 +1279,7 @@ msgstr ""
# Destès? ivb
# Desatès, sí. jm
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
@@ -3612,20 +3612,20 @@ msgstr "Ha fallat el procés de signatura: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Aquesta clau no està protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, 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:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "La clau està protegida.\n"
@@ -3642,7 +3642,7 @@ msgstr ""
"Introduïu la nova contrasenya per a la clau secreta.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
@@ -4480,13 +4480,13 @@ msgid "writing key binding signature\n"
msgstr "s'està escrivint la signatura de comprovació de la clau\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, 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:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -4701,7 +4701,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "És correcte? (s/n)"
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4712,7 +4712,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4729,44 +4729,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nom i cognoms: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "El nom no pot començar amb un dígit\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
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:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Adreça electrònica: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "No és una adreça vàlida\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Comentari: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Esteu usant el joc de caràcters `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4777,10 +4777,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
# xX? ivb
# Hmm... sí. jm
#. TRANSLATORS: These are the allowed answers in
@@ -4794,23 +4798,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:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoXx"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Corregiu l'error primer\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4818,19 +4822,19 @@ msgstr ""
"Cal una contrasenya per a protegir la clau secreta.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4842,7 +4846,7 @@ msgstr ""
"useu aquest programa amb l'opció \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4854,53 +4858,53 @@ msgstr ""
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "La generació de claus ha estat cancel·lada.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "s'està escrivint la clau pública a «%s»\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, 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:3538
+#: g10/keygen.c:3566
#, 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:3545
+#: g10/keygen.c:3573
#, 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:3565
+#: g10/keygen.c:3593
#, 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:3573
+#: g10/keygen.c:3601
#, 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:3600
+#: g10/keygen.c:3628
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:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4909,13 +4913,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, 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:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4924,7 +4928,7 @@ msgstr ""
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4932,26 +4936,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:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, 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:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -5683,7 +5687,7 @@ msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5698,35 +5702,35 @@ msgstr ""
"molt gran!\n"
"Es recomana una imatge amb una mida aproximada de 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Introduïu el nom del fitxer JPEG per al photo ID: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "No s'ha pogut obrir la foto «%s»: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "«%s» no és un fitxer JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "És aquesta foto correcta (s/N/x)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "no s'ha pogut mostrar el photo ID!\n"
diff --git a/po/cs.po b/po/cs.po
index 74ee67a94..4a74205fb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.3.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -95,7 +95,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann algoritmus %d nen podporovn\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -104,7 +104,7 @@ msgstr "nemohu vytvoit `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1237,7 +1237,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Nalezena OpenPGP karta slo %s\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nelze provst v dvkovm mdu\n"
@@ -3486,19 +3486,19 @@ msgstr ""
"K dispozici je jen kontroln souet kle nebo je kl na kart - passphrase "
"nelze zmnit.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Tento kl nen chrnn.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn sti primrnho kle nejsou dostupn.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn st primrnho kle jsou uloeny na kart.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Kl je chrnn.\n"
@@ -3515,7 +3515,7 @@ msgstr ""
"Vlote nov heslo (passphrase) pro tento tajn kl.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nen zopakovno sprvn; zkuste to znovu"
@@ -4278,13 +4278,13 @@ msgid "writing key binding signature\n"
msgstr "zapisuji \"key-binding\" podpis\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn dlka kle; pouiji %u bit\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dlka kle zaokrouhlena na %u bit\n"
@@ -4492,7 +4492,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Je to sprvn (a/N)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4503,7 +4503,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4519,44 +4519,44 @@ msgstr ""
" \"Magda Prochazkova (student) <magda@domena.cz>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Jmno a pjmen: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Neplatn znak ve jmn\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Jmno neme zanat slic\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Jmno mus bt dlouh alespo 5 znak\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "E-mailov adresa: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Neplatn e-mailov adresa\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Koment: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Neplatn znak v komenti\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pouvte znakovou sadu `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4567,10 +4567,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4582,25 +4586,25 @@ msgstr "Do pole jmno nebo koment nepite, prosm, e-mailovou adresu.\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "jJkKeEPpUu"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Nejdv, prosm, opravte chybu\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4608,19 +4612,19 @@ msgstr ""
"Pro ochranu Vaeho tajnho kle muste zadat heslo.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Prosm, vlote heslo; toto je tajn vta \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4632,7 +4636,7 @@ msgstr ""
"tohoto programu s parametrem \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4645,50 +4649,50 @@ msgstr ""
"pouvat disky); dky tomu m genertor lep anci zskat dostatek "
"entropie.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Vytven kle bylo zrueno.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuji veejn kl do `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuji tajn kl do `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovateln soubor veejnch kl (pubring): %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenalezen zapisovateln soubor tajnch kl (secring): %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pi zpisu do souboru veejnch kl `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pi zpisu do souboru tajnch kl `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "veejn a tajn kl byly vytvoeny a podepsny.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4696,12 +4700,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoen kle se nepodailo: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4709,7 +4713,7 @@ msgstr ""
"kl byl vytvoen %lu sekund v budoucnosti (dolo ke zmn asu nebo\n"
"je problm se systmovm asem)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4717,25 +4721,25 @@ msgstr ""
"kl byl vytvoen %lu sekund v budoucnosti (dolo ke zmn asu nebo\n"
"je problm se systmovm asem)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Opravdu vytvoit? (a/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "uloen kle na kartu se nezdailo: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nemohu vytvoit zlohu souboru `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "POZNMKA: zloha kle z karty uloena do `%s'\n"
@@ -5431,7 +5435,7 @@ msgstr "dlka %u bit, typ %s, kl %s, vytvoen %s"
msgid " (subkey on main key ID %s)"
msgstr " (podkl na hlavnm kli ID %s)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5445,34 +5449,34 @@ msgstr ""
"kli - velk obrzek bude mt za nsledek velmi velk veejn kl !\n"
"Vhodn velikost obrzku je asi 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Vlote jmno JPEG souboru s fotografickm ID: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "nelze otevt JPEG soubor `%s': %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Tento JPEG je opravdu velk (%d bajt)!\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Jste si jist(), e jej chcete pout? (a/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "`%s' nen soubor ve formtu JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Je tato fotografie sprvn (a/N/u)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "nelze zobrazit photo ID!\n"
diff --git a/po/da.po b/po/da.po
index ee627014a..8c5760a00 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "valgte cifferalgoritme %d er ugyldig\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, fuzzy, c-format
@@ -102,7 +102,7 @@ msgstr "kan ikke oprette %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1219,7 +1219,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr ""
@@ -3456,21 +3456,21 @@ msgstr "signering fejlede: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Denne ngle er ikke beskyttet.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "hemmelig ngle ikke tilgngelig"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Nglen er beskyttet.\n"
@@ -3485,7 +3485,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "kodestningen blev ikke ordentlig gentaget; prv igen.\n"
@@ -4287,13 +4287,13 @@ msgid "writing key binding signature\n"
msgstr ""
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nsket nglestrrelse er %u bit\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
@@ -4493,7 +4493,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/n)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4504,7 +4504,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4514,44 +4514,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Rigtige navn: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Navn m ikke starte med et tal\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal vre mindst 5 bogstaver langt\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruger '%s' tegnsttet.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4562,10 +4562,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4577,24 +4581,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
#, 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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4602,7 +4606,7 @@ msgstr ""
"Du skal bruge en kodestning til at beskytte din hemmelige ngle.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@ -4611,12 +4615,12 @@ msgstr ""
"Du skal bruge en kodestning til at beskytte din hemmelige ngle.\n"
"\n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4624,7 +4628,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4632,92 +4636,92 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Ngleoprettelse annulleret.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentligt certifikat til '%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ngle %08lX: offentlig ngle ikke fundet: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fejl ved skrivning af nglering `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig ngle oprettet og signeret.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette?"
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "hemmelige ngler import: %lu\n"
@@ -5426,7 +5430,7 @@ msgstr ""
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5435,37 +5439,37 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "kan ikke bne %s: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Er du sikker p at de vil benytte denne nglestrrelse? "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "%s er ikke et gyldigt tegnst\n"
# virker j automatisk istedetfor y?
-#: g10/photoid.c:165
+#: g10/photoid.c:166
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "Er dette korrekt (j/n)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "kan ikke bne %s: %s\n"
diff --git a/po/de.po b/po/de.po
index 088611ca4..306117968 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.13\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
-"PO-Revision-Date: 2009-09-03 14:38+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
+"PO-Revision-Date: 2009-09-03 21:35+0200\n"
"Last-Translator: Werner Koch <wk@gnupg.org>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -106,7 +106,7 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1217,7 +1217,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP Karte Nr. %s erkannt\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
@@ -3488,19 +3488,19 @@ msgstr ""
"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
"keine Passphrase ist zu ändern.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Dieser Schlüssel ist nicht geschützt.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Schlüssel ist geschützt.\n"
@@ -3517,7 +3517,7 @@ msgstr ""
"Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
@@ -4296,13 +4296,13 @@ msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
@@ -4512,7 +4512,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ist dies richtig? (j/N) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4526,7 +4526,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4542,44 +4542,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Ungültiges Zeichen im Namen\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Email-Adresse: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Diese Email-Adresse ist ungültig\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Ungültiges Zeichen im Kommentar.\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4590,10 +4590,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!\n"
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4605,23 +4609,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfBb"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4629,7 +4633,7 @@ msgstr ""
"Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
@@ -4637,12 +4641,12 @@ msgstr ""
"Bitte geben Sie die Passphrase ein, um die Sicherheitskopie des neuen "
"Verschlüsselungsschlüssel der Karte zu schützen."
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4655,7 +4659,7 @@ msgstr ""
"aufrufen.\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4666,50 +4670,50 @@ msgstr ""
"unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4718,12 +4722,12 @@ msgstr ""
"werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n"
"Unterschlüssel für diesem Zweck erzeugen.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4731,7 +4735,7 @@ msgstr ""
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4739,25 +4743,25 @@ msgstr ""
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HINWEIS: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? (j/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
@@ -5465,7 +5469,7 @@ msgid " (subkey on main key ID %s)"
msgstr " (Unterschlüssel aus Hauptschlüssel-ID %s)"
# translated by wk
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5480,34 +5484,34 @@ msgstr ""
"wir Ihr Schlüssel leider auch sehr groß werden. Ein Bild der Größe\n"
"240x288 Pixel ist eine gute Wahl.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Dateiname mit JPEG für die Foto-ID eingeben: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "JPEG-Datei `%s' kann nicht geöffnet werden: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Diese JPEG-Datei ist echt groß (%d Byte)!\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Wollen Sie es wirklich benutzen? (j/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "`%s' ist keine JPEG-Datei\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Ist dieses Bild richtig? (j/N) "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
diff --git a/po/el.po b/po/el.po
index caf1a023d..e1b0e8d70 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr " %d%s\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -102,7 +102,7 @@ msgstr " `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1231,7 +1231,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr " (batchmode)\n"
@@ -3547,20 +3547,20 @@ msgstr " : %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr " .\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr " .\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr " .\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr " .\n"
@@ -3577,7 +3577,7 @@ msgstr ""
" .\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr " . "
@@ -4396,13 +4396,13 @@ msgid "writing key binding signature\n"
msgstr " \"\" \n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr " , %u bits\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr " %u bits\n"
@@ -4615,7 +4615,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr " (y/n); "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4626,7 +4626,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4643,44 +4643,44 @@ msgstr ""
" \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr " : "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr " \n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr " \n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr " 5 \n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr " Email: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr " Email\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr ": "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr " \n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr " `%s' .\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4691,10 +4691,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr " email \n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4706,23 +4710,23 @@ msgstr " email \n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr " (N), (C), (E)mail (Q); "
-#: g10/keygen.c:2168
+#: g10/keygen.c:2203
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr " (N), (C), (E)mail (O)/(Q); "
-#: g10/keygen.c:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr ", \n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4730,19 +4734,19 @@ msgstr ""
" .\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr " ߷ \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4754,7 +4758,7 @@ msgstr ""
" , \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4766,50 +4770,50 @@ msgstr ""
" ) . \n"
" .\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr " .\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr " `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr " .\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4820,12 +4824,12 @@ msgstr ""
" \"--edit-key\" \n"
" .\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr " : %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4833,7 +4837,7 @@ msgstr ""
" %lu ( \n"
" )\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4841,28 +4845,28 @@ msgstr ""
" %lu ( \n"
" )\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
": v3 \n"
" OpenPGP\n"
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr " ; "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr " block : %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr " `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ": %08lX %s\n"
@@ -5572,7 +5576,7 @@ msgstr "%u-bit %s , ID %08lX, %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5586,35 +5590,35 @@ msgstr ""
" !\n"
" 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr " photo ID: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr " : %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr " ; (y/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\" JPEG \n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr " (y/N/q); "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr " photo ID!\n"
diff --git a/po/eo.po b/po/eo.po
index c872b0d52..149bf73f5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "protekto-metodo %d%s ne estas realigita\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -102,7 +102,7 @@ msgstr "ne povas krei '%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1238,7 +1238,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga reimo\n"
@@ -3533,20 +3533,20 @@ msgstr "subskribado malsukcesis: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "i tiu losilo ne estas protektita.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de efa losilo ne estas disponataj.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, 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:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "losilo estas protektita.\n"
@@ -3563,7 +3563,7 @@ msgstr ""
"Donu la novan pasfrazon por i tiu sekreta losilo.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "la pasfrazo ne estis uste ripetita; provu denove"
@@ -4373,13 +4373,13 @@ msgid "writing key binding signature\n"
msgstr "skribas losilbindan subskribon\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "losilgrando nevalida; uzas %u bitojn\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "losilgrando rondigita is %u bitoj\n"
@@ -4592,7 +4592,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "u tio estas usta (j/n)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4603,7 +4603,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4619,44 +4619,44 @@ msgstr ""
" \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Vera nomo: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komencii per cifero\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena 5 signojn\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Retadreso: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Komento: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4667,10 +4667,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4682,23 +4686,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a la komenton\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4706,19 +4710,19 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan losilon.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4730,7 +4734,7 @@ msgstr ""
"uzante i tiun programon kun la opcio \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4742,50 +4746,50 @@ msgstr ""
"kreado de la primoj; tio donas al la stokastilo pli bonan ancon\n"
"akiri sufie da entropio.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Kreado de losiloj nuligita.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skribas publikan losilon al '%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skribas sekretan losilon al '%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika losilaro trovita: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "neniu skribebla sekreta losilaro trovita: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eraro dum skribado de publika losilaro '%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eraro dum skribado de sekreta losilaro '%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta losiloj kreitaj kaj subskribitaj.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4794,12 +4798,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de losiloj malsukcesis: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4807,7 +4811,7 @@ msgstr ""
"losilo estis kreita %lu sekundon en la estonteco (tempotordo a "
"horloeraro)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4815,26 +4819,26 @@ msgstr ""
"losilo estis kreita %lu sekundojn en la estonteco (tempotordo a "
"horloeraro)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "u vere krei? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "forvio de losilbloko malsukcesis: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTO: sekreta losilo %08lX eksvalidiis je %s\n"
@@ -5546,7 +5550,7 @@ msgstr "%u-bita %s-losilo, %08lX, kreita je %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5555,36 +5559,36 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "u vi estas certa, ke vi ankora volas subskribi in?\n"
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "%s: ne estas fido-datenaro\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "u tio estas usta (j/n)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "ne povas malfermi %s: %s\n"
diff --git a/po/es.po b/po/es.po
index afaf0a0cc..ea7834630 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2008-12-14 19:34+0100\n"
"Last-Translator: Jaime Surez <jaime@mundocripto.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -113,7 +113,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "no pueden usarse claves ssh de ms de %d bits\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -122,7 +122,7 @@ msgstr "no se puede crear %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1246,7 +1246,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "tarjeta OpenPGP num. %s detectada\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
@@ -3461,19 +3461,19 @@ msgstr ""
"La clave tiene slo un apuntador u objetos de clave en la propia tarjeta\n"
"- no hay frase contrasea que cambiar.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Esta clave no est protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Las partes secretas de la clave primaria no estn disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
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:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "La clave est protegida.\n"
@@ -3490,7 +3490,7 @@ msgstr ""
"Introduzca la nueva frase contrasea para esta clave secreta.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "frase contrasea repetida incorrectamente; intntelo de nuevo"
@@ -4247,13 +4247,13 @@ msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobacin de clave\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamao de clave incorrecto; se usarn %u bits\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamao de clave redondeado a %u bits\n"
@@ -4463,7 +4463,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Es correcto? (s/n) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4477,7 +4477,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4493,44 +4493,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nombre y apellidos: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Caracter invlido en el nombre\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un nmero\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Direccin de correo electrnico: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Direccin invlida\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Caracter invlido en el comentario\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est usando el juego de caracteres `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4541,12 +4541,16 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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 "
"comentario\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4558,23 +4562,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Por favor corrija primero el error.\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4582,7 +4586,7 @@ msgstr ""
"Necesita una frase contrasea para proteger su clave secreta.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@ -4590,12 +4594,12 @@ msgid ""
msgstr ""
"Introduzca la frase contrasea para proteger el objeto importado en GnuPG"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4607,7 +4611,7 @@ msgstr ""
"la opcin \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4620,50 +4624,50 @@ msgstr ""
"generador de nmeros aleatorios mayor oportunidad de recoger suficiente\n"
"entropa.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Creacin de claves cancelada.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "escribiendo clave pblica en `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escribiendo apuntador de la clave privada en `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "escribiendo clave privada en `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo pblico de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "anillo privado de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error escribiendo anillo pblico `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "claves pblica y secreta creadas y firmadas.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4671,12 +4675,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creacin de la clave fallida: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4684,7 +4688,7 @@ msgstr ""
"clave pblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4692,25 +4696,25 @@ msgstr ""
"clave pblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Crear de verdad? (s/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "almacenado de clave en la tarjeta fallido: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, 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:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -5407,7 +5411,7 @@ msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
msgid " (subkey on main key ID %s)"
msgstr " (subclave en clave principal ID %s)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5421,34 +5425,34 @@ msgstr ""
"Si usa una foto muy grande, su clave ser tambin muy grande!\n"
"Una imagen cercana a 240x288 tiene un tamao adecuado.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Introduzca nombre del fichero JPEG para ID fotogrfico: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "Imposible abrir fichero JPEG `%s': %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Este JPEG es realmente grande (%d bytes)!\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Seguro que quiere usarlo? (s/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "`%s' no es un fichero JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Es correcta la foto? (s/n) "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "no puedo mostrar ID fotogrfico!\n"
diff --git a/po/et.po b/po/et.po
index 0c04d25cf..d69cad3e2 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "kaitse algoritm %d%s ei ole toetatud\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -102,7 +102,7 @@ msgstr "`%s' ei nnestu luua: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1229,7 +1229,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
@@ -3517,20 +3517,20 @@ msgstr "allkirjastamine ebannestus: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "See vti ei ole kaitstud.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse vtme salajased komponendid ei ole kttesaadavad.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Primaarse vtme salajased komponendid ei ole kttesaadavad.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Vti on kaitstud.\n"
@@ -3547,7 +3547,7 @@ msgstr ""
"Sisestage sellele salajasele vtmele uus parool.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "parooli ei korratud ieti; proovige uuesti"
@@ -4353,13 +4353,13 @@ msgid "writing key binding signature\n"
msgstr "kirjutan vtit siduva allkirja\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane vtme suurus; kasutan %u bitti\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "vtme suurus mardatud les %u bitini\n"
@@ -4572,7 +4572,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "On see ige (j/e)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4583,7 +4583,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4599,44 +4599,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Prisnimi: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Lubamatu smbol nimes\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Nimi ei vi alata numbriga\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema vhemalt 5 smbolit\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "E-posti aadress: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Lubamatu smbol kommentaaris\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4647,10 +4647,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4662,23 +4666,23 @@ msgstr "rge palun kirjutage e-posti aadressi prisnimesse ega kommentaari\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Palun parandage kigepealt viga\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4686,19 +4690,19 @@ msgstr ""
"Te vajate oma salajase vtme kaitsmiseks parooli.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Palun sisestage parool; see on salajane tekst \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4710,7 +4714,7 @@ msgstr ""
"kasutades seda programmi vtmega \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4722,50 +4726,50 @@ msgstr ""
"kasutada kettaid jne), see annaks juhuarvude generaatorile vimaluse\n"
"koguda paremat entroopiat.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Vtme genereerimine katkestati.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjutan avaliku vtme faili `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjutan salajase vtme faili `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike vtmete hoidlat pole: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjutatavat salajaste vtmete hoidlat pole: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "viga avaliku vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "viga salajase vtme vtmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane vti on loodud ja allkirjastatud.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4775,43 +4779,43 @@ msgstr ""
"Krptimiseks tuleb genereerida teine vti, seda saate teha\n"
"kasutades vtit \"--edit-key\".\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vtme genereerimine ebannestus: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "vti loodi %lu sekund tulevikus (ajahpe vi kella probleem)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "vti loodi %lu sekundit tulevikus (ajahpe vi kella probleem)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon testi? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "vtmebloki kustutamine ebannestus: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "`%s' ei nnestu luua: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "MRKUS: salajane vti %08lX aegus %s\n"
@@ -5515,7 +5519,7 @@ msgstr "%u-bitine %s vti, ID %08lX, loodud %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5529,35 +5533,35 @@ msgstr ""
"vga suurt pilti, on ka kti vha suur!\n"
"Mistlik pildi suurus viks olla umbes 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "faili ei nnestu avada: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\": ei ole JPEG fail\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "On see foto ige (j/E/v)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "foto ID ei saa nidata!\n"
diff --git a/po/fi.po b/po/fi.po
index 16eb86997..c24fc4ca2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -109,7 +109,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -118,7 +118,7 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1248,7 +1248,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
@@ -3543,20 +3543,20 @@ msgstr "allekirjoitus epäonnistui: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Avainta ei ole suojattu.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, 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:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Avain on suojattu.\n"
@@ -3573,7 +3573,7 @@ msgstr ""
"Syötä uusi salasana salaiselle avaimelle.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
@@ -4384,13 +4384,13 @@ msgid "writing key binding signature\n"
msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -4603,7 +4603,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Onko tämä oikein (k/e) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4614,7 +4614,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4632,44 +4632,44 @@ msgstr ""
" \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Oikea nimi: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Nimessä on epäkelpo merkki\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Nimi ei voi alkaa numerolla\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
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:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Sähköpostiosoite: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Huomautus: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Huomautuksessa on epäkelpo merkki\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Käytät merkistöä \"%s\".\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4680,10 +4680,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4695,23 +4699,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnHhSsOoLl"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Ole hyvä ja korjaa ensin virhe\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4719,19 +4723,19 @@ msgstr ""
"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4743,7 +4747,7 @@ msgstr ""
"tämän ohjelman valitsimella \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4755,50 +4759,50 @@ msgstr ""
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4807,12 +4811,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4820,7 +4824,7 @@ msgstr ""
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4828,26 +4832,26 @@ msgstr ""
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -5559,7 +5563,7 @@ msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5574,35 +5578,35 @@ msgstr ""
"käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n"
"Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "ei voi avata tiedostoa: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\" ei ole JPEG-tiedosto\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Onko tämä oikein (k/E/l)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "valokuvatunnistetta ei voi näyttää!\n"
diff --git a/po/fr.po b/po/fr.po
index 539df7ab5..27fc38b08 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2008-09-30 19:38+0200\n"
"Last-Translator: Gal Quri <gael@lautre.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -99,7 +99,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "le hachage de protection %d n'est pas support\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -108,7 +108,7 @@ msgstr "impossible de crer `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1257,7 +1257,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "carte OpenPGP n %s dtecte\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
@@ -3559,21 +3559,21 @@ msgstr ""
"La cl possde seulement des items partiels ou stocks sur carte -\n"
"pas de phrase de passe changer.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Cette cl n'est pas protge.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parties secrtes de la cl principale ne sont pas disponibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
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:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "La cl est protge.\n"
@@ -3588,7 +3588,7 @@ msgid ""
"\n"
msgstr "Entrez la nouvelle phrase de passe pour cette cl secrte.\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "la phrase de passe n'a pas t correctement rpte ; recommencez."
@@ -4389,13 +4389,13 @@ msgid "writing key binding signature\n"
msgstr "criture de la signature de liaison\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Taille invalide; utilisation de %u bits\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie %u bits\n"
@@ -4603,7 +4603,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est-ce correct ? (o/N) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4614,7 +4614,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4630,44 +4630,44 @@ msgstr ""
" Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> \n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nom rel: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Caractre invalide dans le nom\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
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:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Adresse e-mail: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse e-mail valide\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Commentaire: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Caractre invalide dans le commentaire\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vous utilisez le jeu de caractres '%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4678,11 +4678,15 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4694,23 +4698,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Corrigez l'erreur d'abord\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4719,19 +4723,19 @@ msgstr ""
"secrte.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Entrez le mot de passe ; c'est une phrase secrte \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4745,7 +4749,7 @@ msgstr ""
" --edit-key .\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4757,52 +4761,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:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "La gnration de cl a t annule.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "criture de la cl publique dans `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "criture d'une cl secrte partielle dans `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "criture de la cl secrte dans `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, 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:3545
+#: g10/keygen.c:3573
#, 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:3565
+#: g10/keygen.c:3593
#, 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:3573
+#: g10/keygen.c:3601
#, 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:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "les cls publique et secrte ont t cres et signes.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4811,13 +4815,13 @@ msgstr ""
"utiliser la commande --edit-key pour gnrer une sous-cl \n"
"cette fin.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, 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:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4825,7 +4829,7 @@ msgstr ""
"la cl a t cre %lu seconde dans le futur (rupture spatio-temporelle ou\n"
"problme d'horloge)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4833,26 +4837,26 @@ msgstr ""
"la cl a t cre %lu secondes dans le futur (rupture spatio-temporelle ou\n"
"problme d'horloge\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Crer vraiment ? (o/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, 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:4104
+#: g10/keygen.c:4132
#, 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:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTE: sauvegarde de la cl de la carte dans `%s'\n"
@@ -5573,7 +5577,7 @@ msgstr "cl de %u bits %s, ID %s, cre le %s"
msgid " (subkey on main key ID %s)"
msgstr " (sous-cl de la cl principale ID %s)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5588,34 +5592,34 @@ msgstr ""
"en sera de mme pour votre cl !\n"
"La meilleure taille utiliser est 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Entrez le nom du fichier JPEG pour la photo d'identit: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "impossible d'ouvrir le fichier JPEG `%s': %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Ce JPEG est vraiment trs grand (%d octets) !\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "tes-vous sr de vouloir l'utiliser ? (o/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "`%s' n'est pas un fichier JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Cette photo est-elle correcte (o/N/q) ? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "impossible d'afficher la photo d'identit !\n"
diff --git a/po/gl.po b/po/gl.po
index 81e1a22b1..842852175 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "o algoritmo de proteccin %d%s non est soportado\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -102,7 +102,7 @@ msgstr "non se pode crear `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1239,7 +1239,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
@@ -3541,20 +3541,20 @@ msgstr "fallou a sinatura: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Esta chave non est protexida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "as partes secretas da chave primaria non estn dispoibles.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, 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:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "A chave est protexida.\n"
@@ -3571,7 +3571,7 @@ msgstr ""
"Introduza o novo contrasinal para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; tnteo de novo"
@@ -4396,13 +4396,13 @@ msgid "writing key binding signature\n"
msgstr "escribindo unha sinatura que liga a chave\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamao de chave non vlido; empregando %u bits\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamao de chave redondeado a %u bits\n"
@@ -4615,7 +4615,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Isto correcto? (s/n) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4626,7 +4626,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4643,44 +4643,44 @@ msgstr ""
" \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nome: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Caracter non vlido no nome\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "O nome non pode comezar cun dxito\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "O nome debe ter alomenos 5 caracteres\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Enderezo de E-mail: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Non un enderezo de e-mail vlido\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Carcter non vlido no comentario\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est a usa-lo xogo de caracteres `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4691,11 +4691,15 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4707,23 +4711,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeAaSs"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Por favor, corrixa antes o erro\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4731,19 +4735,19 @@ msgstr ""
"Necesita un contrasinal para protexe-la sa chave secreta.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Por favor, introduza o contrasinal; esta unha frase secreta \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4755,7 +4759,7 @@ msgstr ""
"momento, empregando este programa coa opcin \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4767,50 +4771,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:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeracin de chaves.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "gravando a chave pblica en `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, 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:3545
+#: g10/keygen.c:3573
#, 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:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro pblico `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "creronse e asinronse as chaves pblica e secreta.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4820,12 +4824,12 @@ msgstr ""
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeracin da chave fallou: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4833,7 +4837,7 @@ msgstr ""
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4841,26 +4845,26 @@ msgstr ""
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realmente? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -5567,7 +5571,7 @@ msgstr "%u-bits, chave %s, ID %08lX, creada %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5581,35 +5585,35 @@ msgstr ""
"pblica. Se emprega unha imaxe moi grande, a sa chave tamn se ha volver\n"
"moi grande. Un bo tamao para empregar un semellante a 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Introduza o nome do ficheiro JPEG: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "non se puido abrir un ficheiro: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Est seguro de que quere empregala (s/N)? "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\" non un ficheiro JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr " esta foto correcta (s/N/q)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "non se pode amosa-la identificacin fotogrfica!\n"
diff --git a/po/hu.po b/po/hu.po
index 9d71ce4f3..eb04ad82a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d%s vd algoritmus nem tmogatott.\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -102,7 +102,7 @@ msgstr "Nem tudom ltrehozni a(z) \"%s\" llomnyt: %s.\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1229,7 +1229,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsinlni ktegelt mdban!\n"
@@ -3517,20 +3517,20 @@ msgstr "Alrs sikertelen: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Ez a kulcs nem vdett.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Az elsdleges kulcs titkos rszei nem elrhetk.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Az elsdleges kulcs titkos rszei nem elrhetk.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "A kulcs vdett.\n"
@@ -3547,7 +3547,7 @@ msgstr ""
"rja be az j jelszt ehhez a titkos kulcshoz!\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "Nem ismtelte meg helyesen a jelszt! Prblja jra!"
@@ -4357,13 +4357,13 @@ msgid "writing key binding signature\n"
msgstr "sszefz alrst rok.\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Kulcsmret rvnytelen; %u bitet hasznlok.\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Kulcsmretet felkerektettem %u bitre.\n"
@@ -4576,7 +4576,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ez gy helyes (i/n)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4587,7 +4587,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4604,44 +4604,44 @@ msgstr ""
" \"Heinrich Heine (a klt) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Teljes nv: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "rvnytelen karakter a nvben!\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "A nv lehet, hogy nem kezddhet szmmal!\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "A nv legalbb 5 karakter kell legyen!\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "E-mail cm: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Ez nem rvnyes e-mail cm.\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Megjegyzs: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "rvnytelen karakter a megjegyzsben!\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "n a(z) %s karakterkdolst hasznlja.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4652,10 +4652,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4667,24 +4671,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:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnMmEeRrKk"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Krem, elbb javtsa ki a hibt!\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4692,19 +4696,19 @@ msgstr ""
"Most szksg van egy jelszra (vagy mondatra), amely a titkos kulcst vdi.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Krem, adja meg a jelszt! Ezt egy titkos mondat. \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4716,7 +4720,7 @@ msgstr ""
"az \"--edit-key\" opcival.\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4728,50 +4732,50 @@ msgstr ""
"a lemezeket) a prmszm generlsa alatt. Ez segti a vletlenszm-\n"
"genertort, hogy entrpit tudjon gyjteni.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Kulcs ltrehozsa megszaktva.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "rom a kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "rom a titkos kulcsot a %s llomnyba.\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem rhat nyilvnoskulcs-karikt talltam: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "Nem rhat titkoskulcs-karikt talltam: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" nyilvnoskulcs-karika rsakor: %s.\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika rsakor: %s.\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "A nyilvnos s titkos kulcsokat ltrehoztam s alrtam.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4781,46 +4785,46 @@ msgstr ""
"kvn ilyen clra ltrehozni, azt az \"--edit-key\" parancs segtsgvel\n"
"teheti meg.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgenerls sikertelen: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu msodperccel a jvben kszlt. (Idugrs vagy raproblma.)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu msodperccel a jvben kszlt. (Idugrs vagy raproblma.)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Valban ltrehozzam? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "A kulcsblokk trlse sikertelen: %s.\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, 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:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "MEGJEGYZS: %08lX titkos kulcs %s-kor lejrt.\n"
@@ -5537,7 +5541,7 @@ msgstr "%u bites %s kulcs, azonost: %08lX, ltrehozva: %s."
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5551,35 +5555,35 @@ msgstr ""
"kpet hasznl, a kulcsa is nagyon nagy lesz!\n"
"A 240x288 krli kpmret jl hasznlhat.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Adja meg egy JPEG fjl nevt a fotazonosthoz: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "Nem tudom megnyitni az llomnyt: %s.\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Biztos abban, hogy hasznlni akarja (i/N)? "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\" nem JPEG llomny.\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Ez a fot megfelel (i/N/k)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "Nem tudom megjelenteni a fotazonostt!\n"
diff --git a/po/id.po b/po/id.po
index 2bd093cf0..f5defeb91 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -95,7 +95,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritma proteksi %d%s tidak didukung\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -104,7 +104,7 @@ msgstr "tidak dapat membuat %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1232,7 +1232,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@ -3528,20 +3528,20 @@ msgstr "gagal menandai: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Kunci ini tidak diproteksi.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Kunci diproteksi.\n"
@@ -3558,7 +3558,7 @@ msgstr ""
"Masukkan passphrase baru untuk kunci rahasia ini.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
@@ -4371,13 +4371,13 @@ msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize tidak valid; menggunakan %u bit\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize dibulatkan hingga %u bit\n"
@@ -4590,7 +4590,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Benar (y/t)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4601,7 +4601,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4617,44 +4617,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:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nama sebenarnya: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Alamat email: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Komentar: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4664,10 +4664,14 @@ msgstr ""
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4679,23 +4683,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Silakan perbaiki kesalahan ini dulu\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4703,19 +4707,19 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4728,7 +4732,7 @@ msgstr ""
"menggunakan program ini dengan pilihan \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4740,50 +4744,50 @@ msgstr ""
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "menulis kunci publik ke `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "kesalahan menulis keyring publik `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4793,45 +4797,45 @@ msgstr ""
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -5532,7 +5536,7 @@ msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5548,35 +5552,35 @@ msgstr ""
"gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
"Jagalah agar gambar mendekati ukuran 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Masukkan nama file JPEG sebagai ID foto: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "tidak dapat membuka file: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\" bukan sebuah file JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Apakah foto ini benar (y/N/q)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "tidak dapat menampilkan photo ID!\n"
diff --git a/po/it.po b/po/it.po
index 8806d970b..35191c4e4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.1.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2008-05-26 12:02+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "l'algoritmo di protezione %d%s non gestito\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -102,7 +102,7 @@ msgstr "impossibile creare `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1230,7 +1230,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
@@ -3533,20 +3533,20 @@ msgstr "firma fallita: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Questa chiave non protetta.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "La chiave protetta.\n"
@@ -3563,7 +3563,7 @@ msgstr ""
"Inserisci la nuova passphrase per questa chiave segreta.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
@@ -4384,13 +4384,13 @@ msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "dimensione della chiave non valida; uso %u bit\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -4603,7 +4603,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr " giusto (s/n)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4614,7 +4614,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4631,44 +4631,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nome e Cognome: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Il nome non pu iniziare con una cifra\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Indirizzo di Email: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non valido\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Commento: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4679,10 +4679,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4694,23 +4698,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:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Per favore correggi prima l'errore\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4718,19 +4722,19 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Inserisci la passphrase, cio una frase segreta \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4742,7 +4746,7 @@ msgstr ""
"programma con l'opzione \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4754,50 +4758,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:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scrittura della chiave pubblica in `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non stato trovato un portachiavi pubblico scrivibile: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non stato trovato un portachiavi segreto scrivibile: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4807,12 +4811,12 @@ msgstr ""
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4820,7 +4824,7 @@ msgstr ""
"la chiave stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4828,26 +4832,26 @@ msgstr ""
"la chiave stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -5556,7 +5560,7 @@ msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5573,35 +5577,35 @@ msgstr ""
"molto\n"
"grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "impossibile aprire il file: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\": non un file JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Questa foto giusta? (s/N/q) "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "impossibile mostrare l'ID fotografico\n"
diff --git a/po/ja.po b/po/ja.po
index 64f4393ea..ae62742cf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.3.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -97,7 +97,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ݸ%dϥݡȤƤޤ\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -106,7 +106,7 @@ msgstr "%sפǤޤ: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1236,7 +1236,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPno. %s򸡽\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "ϥХå⡼ɤǤϤǤޤ\n"
@@ -3445,20 +3445,20 @@ msgstr "̾˼Ԥޤ: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "θݸƤޤ\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "縰̩ʬޤ\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "縰̩ʬޤ\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "ݸƤޤ\n"
@@ -3475,7 +3475,7 @@ msgstr ""
"̩οѥե졼ϤƤ\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "ѥե졼ȷ֤Ƥޤ󡣺ϤƤ"
@@ -4260,13 +4260,13 @@ msgid "writing key binding signature\n"
msgstr "бؤν̾񤭹ߤޤ\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "̵ʸĹ%uӥåȤˤޤ\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Ĺ%uӥåȤ˴ݤޤ\n"
@@ -4476,7 +4476,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Ǥ? (y/N) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4487,7 +4487,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4503,44 +4503,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "̾: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "̵̾ʸޤ\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "̾ǻϤƤϤޤ\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "̾5ʸʾǤʤФʤޤ\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Żҥ᡼롦ɥ쥹: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "ͭŻҥ᡼롦ɥ쥹ǤϤޤ\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr ": "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Ȥ̵ʸޤ\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "ʤʸ%sפȤäƤޤ\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4551,10 +4551,14 @@ msgstr ""
" %s\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Żҥ᡼Υɥ쥹̾䥳Ȥʤ褦\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4566,23 +4570,23 @@ msgstr "Żҥ᡼Υɥ쥹̾䥳Ȥʤ褦\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "̾(N)(C)Żҥ᡼(E)ѹޤϽλ(Q)? "
-#: g10/keygen.c:2168
+#: g10/keygen.c:2203
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "̾(N)(C)Żҥ᡼(E)ѹޤOK(O)λ(Q)? "
-#: g10/keygen.c:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "ޤ顼Ƥ\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4590,19 +4594,19 @@ msgstr ""
"̩ݸ뤿˥ѥե졼ޤ\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "ѥե졼ϤƤ̩ʸϤΤȤǤ \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4614,7 +4618,7 @@ msgstr ""
"Ρ--edit-keyɥץǤĤǤѹǤޤ\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4625,50 +4629,50 @@ msgstr ""
"Ȥǥ˥Ȥ¾ΤȤ򤹤ȡҤ\n"
"𻨤礭ʤ䤹ʤΤǡᤤޤ\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "äޤ\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "%sפظ񤭹ߤޤ\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "%sפ̩֤񤭹ߤޤ\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "%sפ̩񤭹ߤޤ\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "߲ǽʸؤĤޤ: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "߲ǽ̩ؤĤޤ: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ء%sפνߥ顼: %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "̩ء%sפνߥ顼: %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "̩̾ޤ\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4677,42 +4681,42 @@ msgstr ""
"θϰŹ沽ˤϻѤǤʤȤդƤŹ沽Ԥˤϡ\n"
"--edit-keyɥޥɤȤäƤ\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "˼Ԥޤ: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "%lṳˤǤޤ (ιԤפξ㳲Ǥ礦)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "%lṳˤǤޤ (ιԤפξ㳲Ǥ礦)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ": v3κϡOpenPGPŬ礷ޤ\n"
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "˺ޤ? (y/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "ɤؤθݴɤ˼Ԥޤ: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "Хååסե%sפǤޤ: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ": ɸΥХååפ%sפ¸ޤ\n"
@@ -5402,7 +5406,7 @@ msgstr "%uӥå%s, ID %sդ%s"
msgid " (subkey on main key ID %s)"
msgstr " (縰ID %s )"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5416,34 +5420,34 @@ msgstr ""
"Ƥޤ礦⤷礭ʼ̿ȤȡʤθƱͤ礭ʤ\n"
"ޤ! 240x288餤ˤޤ礭βϡȤ褤Ǥ礦\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "եIDѤJPEGե̾ϤƤ: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "JPEGե%sפޤ: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "JPEGϡ礭 (%dХ) !\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "˻ȤǤ? (y/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "%sפϡJPEGեǤϤޤ\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "μ̿Ǥ (y/N/q)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "եIDɽǽ!\n"
diff --git a/po/nb.po b/po/nb.po
index 74a27ee2c..53a38d1a4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.3\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2006-06-13 20:31+0200\n"
"Last-Translator: Trond Endrestl <Trond.Endrestol@fagskolen.gjovik.no>\n"
"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.uio.no>\n"
@@ -97,7 +97,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr ""
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -106,7 +106,7 @@ msgstr "kan ikke opprette %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1225,7 +1225,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnummer %s oppdaget\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "kan ikke gjre dette i batchmodus\n"
@@ -3428,19 +3428,19 @@ msgstr "signering mislyktes: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Denne nkkelen er ikke beskyttet.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Hemmelige deler av primrnkkelen er ikke tilgjengelig.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemmelige deler av primrnkkelen er lagret p kort.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Nkkelen er beskyttet.\n"
@@ -3455,7 +3455,7 @@ msgid ""
"\n"
msgstr "Tast inn den nye passfrasen for denne hemmelige nkklen.\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "passfrasen ble ikke gjentatt korrekt; prv igjen"
@@ -4195,13 +4195,13 @@ msgid "writing key binding signature\n"
msgstr "skriver nkkelbindende signatur\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "nkkelstrrelsen er ugyldig; bruker %u bits\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nkkelstrrelsen ble rundet opp til %u bits\n"
@@ -4413,7 +4413,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/N)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4424,7 +4424,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4440,44 +4440,44 @@ msgstr ""
" Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Fullt navn: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Ugyldig tegn i navn\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Navnet kan ikke starte med et siffer\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Navnet m vre minst 5 tegn langt\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Ugyldig tegn i kommentar\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruker tegnsettet %s.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4488,11 +4488,15 @@ msgstr ""
" %s\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4504,23 +4508,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnKeEeRrAa"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
-#: g10/keygen.c:2168
+#: g10/keygen.c:2203
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
-#: g10/keygen.c:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Vennligst korriger feilen frst\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4528,7 +4532,7 @@ msgstr ""
"Du trenger en passfrase for beskytte din hemmelige nkkel.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@ -4537,12 +4541,12 @@ msgstr ""
"Du trenger en passfrase for beskytte din hemmelige nkkel.\n"
"\n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4554,7 +4558,7 @@ msgstr ""
"hjelp av dette programmet og valget --edit-key.\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4566,50 +4570,50 @@ msgstr ""
"diskene jobbe) under primtallgenereringen; dette gir\n"
"tilfeldig-tall-generatoren en bedre sjanse til samle nok entropy.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Nkkelgenereringen ble avbrutt.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentlig nkkel til %s\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver forelpig hemmelig nkkel til %s\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmelig nkkel til %s\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbart offentlig nkkelknippe ble funnet: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "ingen skrivbart hemmelig nkkelknippe ble funnet: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "feil ved skriving av offentlig nkkelknippe %s: %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "feil ved skriving av hemmelig nkkelknippe %s: %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nkkel opprettet og signert.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4618,13 +4622,13 @@ msgstr ""
"kanskje bruke kommandoen --edit-key for generere en\n"
"sekundrnkkel for dette formlet.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nkkelgenerering mislyktes: %s\n"
# Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4633,7 +4637,7 @@ msgstr ""
"klokkeproblem)\n"
# Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4641,27 +4645,27 @@ msgstr ""
"nkkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
"klokkeproblem)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MERK: opprettelse av undernkler for v3-nkler er ikke i samsvar med "
"OpenPGP\n"
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Virkelig opprette? (j/N)"
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "lagring av nkkel p kort mislyktes: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan ikke opprette sikkerhetskopifil %s: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr ""
@@ -5350,7 +5354,7 @@ msgstr "%u-bit %s-nkkel, ID %s, opprettet %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5359,34 +5363,34 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "kan ikke pne JPEG-fil %s: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Er du sikker p at du vil bruke den? (j/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "%s er ikke et JPEG-fil\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr ""
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 2da4f0d29..31659ead2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.7\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2007-11-26 19:01+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "klucze ssh wiksze ni %d bitw nie s obsugiwane\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -102,7 +102,7 @@ msgstr "nie mona utworzy ,,%s'': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1230,7 +1230,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Wykryto kart OpenPGP nr %s\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nie dziaa w trybie wsadowym\n"
@@ -3468,19 +3468,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"Klucz ma tylko zalepk albo elementy na karcie - nie ma hasa do zmiany.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Ten klucz nie jest chroniony.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz tajna gwnego klucza jest niedostpna.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Cz tajna gwnego klucza jest zapisana na karcie.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Klucz jest chroniony.\n"
@@ -3497,7 +3497,7 @@ msgstr ""
"Wprowad nowe dugie, skomplikowane haso dla tego klucza tajnego.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "haso nie zostao poprawnie powtrzone; jeszcze jedna prba"
@@ -4277,13 +4277,13 @@ msgid "writing key binding signature\n"
msgstr "zapis podpisu wicego klucz\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "niewaciwa dugo klucza; wykorzystano %u bitw\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rozmiar klucza zaokrglony w gr do %u bitw\n"
@@ -4493,7 +4493,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Czy wszystko si zgadza (t/N)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4504,7 +4504,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4520,44 +4520,44 @@ msgstr ""
" \"Tadeusz eleski (Boy) <tzb@ziemianska.pl>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Imi i nazwisko: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Niewaciwy znak w imieniu lub nazwisku\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Imi lub nazwisko nie moe zaczyna si od cyfry\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Imi i nazwisko musz mie co najmniej 5 znakw dugoci.\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "To nie jest poprawny adres poczty elektronicznej\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Komentarz: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Niewaciwy znak w komentarzu\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Uywasz zestawu znakw %s.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4568,12 +4568,16 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Nie naley umieszcza adresu poczty elektronicznej w polu nazwiska czy\n"
"komentarza.\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4585,25 +4589,25 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Najpierw trzeba poprawi ten bd\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4611,7 +4615,7 @@ msgstr ""
"Musisz poda dugie, skomplikowane haso aby ochroni swj klucz tajny.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@ -4619,12 +4623,12 @@ msgid ""
msgstr ""
"Prosz wprowadzi haso do zabezpieczenia wanego obiektu w systemie GnuPG."
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4636,7 +4640,7 @@ msgstr ""
"\"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4652,50 +4656,50 @@ msgstr ""
"iloci\n"
"entropii.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zostaa anulowana.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuj klucz publiczny w ,,%s''\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuj zalepk klucza tajnego w ,,%s''\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuj klucz tajny w ,,%s''\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "bd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "bd podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zostay utworzone i podpisane.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4703,12 +4707,12 @@ msgstr ""
"Ten klucz nie moe by wykorzystany do szyfrowania. Komend \"--edit-key\"\n"
"mona doda do niego podklucz szyfrujcy.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powioda si: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4716,7 +4720,7 @@ msgstr ""
"klucz zosta stworzony %lu sekund w przyszoci (zaburzenia\n"
"czasoprzestrzeni, lub le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4724,26 +4728,26 @@ msgstr ""
"klucz zosta stworzony %lu sekund w przyszoci (zaburzenia\n"
"czasoprzestrzeni, lub le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzy? (t/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zapis klucza na karcie nie powid si: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nie mona utworzy pliku kopii zapasowej ,,%s'': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
@@ -5442,7 +5446,7 @@ msgstr "dugo %u bitw, typ %s, numer %s, stworzony %s"
msgid " (subkey on main key ID %s)"
msgstr " (podklucz dla gwnego klucza o ID %s)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5456,34 +5460,34 @@ msgstr ""
"publicznym. Jeli bdzie duy, powikszy to take rozmiar Twojego klucza!\n"
"Dobry rozmiar to okoo 240 na 288 pikseli.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Nazwa pliku ze zdjciem w formacie JPEG: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "nie mona otworzy pliku JPEG ,,%s'': %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Ten JPEG jest naprawd duy (%d bajtw)!\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Czy na pewno chcesz go uy? (t/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr ",,%s'' nie jest plikiem JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Czy zdjcie jest w porzdku? (t/N/w) "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "nie mona wywietli zdjcia!\n"
diff --git a/po/pt.po b/po/pt.po
index 769effe17..37a33f7d9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -96,7 +96,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de proteco %d%s no suportado\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -105,7 +105,7 @@ msgstr "impossvel criar `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1235,7 +1235,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossvel fazer isso em modo no-interativo\n"
@@ -3527,20 +3527,20 @@ msgstr "assinatura falhou: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Componentes secretas da chave primria no disponveis.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Componentes secretas da chave primria no disponveis.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "A chave protegida.\n"
@@ -3557,7 +3557,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "a frase secreta no foi repetida corretamente; tente outra vez"
@@ -4368,13 +4368,13 @@ msgid "writing key binding signature\n"
msgstr "a escrever a assinatura ligada a uma chave\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamanho de chave invlido; a utilizar %u bits\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamanho da chave arredondado para %u bits\n"
@@ -4587,7 +4587,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est correto (s/n)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4598,7 +4598,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4616,44 +4616,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Caracter invlido no nome\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "O nome no pode comear com um dgito\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Endereo de correio eletrnico: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Endereo eletrnico invlido\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Comentrio: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Caracter invlido no comentrio\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc est usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4664,12 +4664,16 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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 "
"comentrio\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4681,23 +4685,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Por favor corrija primeiro o erro\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4705,19 +4709,19 @@ msgstr ""
"Voc precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Por favor digite a frase secreta \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4729,7 +4733,7 @@ msgstr ""
"qualquer hora, usando este programa com a opo \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4741,50 +4745,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:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Gerao de chave cancelada.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "a escrever chave pblica para `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, 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:3545
+#: g10/keygen.c:3573
#, 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:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves pblico `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "chaves pblica e privada criadas e assinadas.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4793,12 +4797,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4806,7 +4810,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4814,26 +4818,26 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "remoo do bloco de chave falhou: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossvel criar `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -5545,7 +5549,7 @@ msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5554,36 +5558,36 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "impossvel abrir %s: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Voc tem certeza de que quer adicion-la de qualquer forma? (s/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "%s: no um base de dados de confiana\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "Est correto (s/n)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "no foi possvel alterar o exec-path para %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1bcc9fd74..517b9ead6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -100,7 +100,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritmo de proteo %d no suportado\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, fuzzy, c-format
@@ -109,7 +109,7 @@ msgstr "impossvel criar %s: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1241,7 +1241,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossvel fazer isso em modo no-interativo\n"
@@ -3530,21 +3530,21 @@ msgstr "assinatura falhou: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Esta chave no protegida.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "chave secreta no disponvel"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "chave secreta no disponvel"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "A chave protegida.\n"
@@ -3561,7 +3561,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "A frase secreta no foi repetida corretamente; tente outra vez.\n"
@@ -4372,13 +4372,13 @@ msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido %u bits\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
@@ -4592,7 +4592,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Est correto (s/n)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4603,7 +4603,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4620,44 +4620,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Caractere invlido no nome\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "O nome no pode comear com um dgito\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Endereo de correio eletrnico: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Endereo eletrnico invlido\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Comentrio: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Caractere invlido no comentrio\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc est usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4668,10 +4668,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4683,24 +4687,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
#, 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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4708,19 +4712,19 @@ msgstr ""
"Voc precisa de uma frase secreta para proteger sua chave.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Por favor digite a frase secreta"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4732,7 +4736,7 @@ msgstr ""
"qualquer hora, usando este programa com a opo \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4744,50 +4748,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:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Gerao de chave cancelada.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado pblico para `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "chave %08lX: chave pblica no encontrada: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "impossvel bloquear chaveiro secreto: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "chaves pblica e privada criadas e assinadas.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4796,12 +4800,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gerao de chaves falhou: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4809,7 +4813,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4817,26 +4821,26 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relgio)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "enumerao de blocos de chaves falhou: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "impossvel criar %s: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -5552,7 +5556,7 @@ msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5561,36 +5565,36 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "impossvel abrir arquivo: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Voc tem certeza de que quer este tamanho de chave? "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "%s: no um banco de dados de confiabilidade\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "Est correto (s/n)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "impossvel abrir %s: %s\n"
diff --git a/po/ro.po b/po/ro.po
index 135e4b29d..6dc1fbbb5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -99,7 +99,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "algoritm rezumat %d nu este suportat\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -108,7 +108,7 @@ msgstr "nu pot crea `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1244,7 +1244,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "cardul OpenPGP nr. %s detectat\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru n modul batch\n"
@@ -3492,19 +3492,19 @@ msgstr ""
"Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz "
"parol de schimbat.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Aceast cheie nu este protejat.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Prile secrete ale cheii primare nu sunt disponibile.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
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:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Cheia este protejat.\n"
@@ -3521,7 +3521,7 @@ msgstr ""
"Introducei noua fraz-parol pentru acest cheie secret.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "fraza-parol nu a fost repetat corect; mai ncercai o dat"
@@ -4297,13 +4297,13 @@ msgid "writing key binding signature\n"
msgstr "scriu semntur legat de cheie\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "lungime cheie invalid; folosesc %u bii\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "lungime cheie rotunjit la %u bii\n"
@@ -4511,7 +4511,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Este aceasta corect? (d/N) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4522,7 +4522,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4539,44 +4539,44 @@ msgstr ""
" \"Popa Ioan (popic) <popa.ioan@compania.ro>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Nume real: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Caracter invalid n nume\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Numele nu poate ncepe cu o cifr\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Numele trebuie s fie de cel puin 5 caractere\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Adres de email: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Nu este o adres de email valid\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Comentariu: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Caracter invalid n comentariu\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Folosii setul de caractere `%s'\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4587,10 +4587,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4602,23 +4606,23 @@ msgstr "V rugm nu punei adresa de email n numele real sau comentariu\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoTt"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "V rugm corectai mai nti eroarea\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4626,7 +4630,7 @@ msgstr ""
"Avei nevoie de o fraz-parol pentru a v proteja cheia secret.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@ -4634,12 +4638,12 @@ msgid ""
msgstr ""
"V rugm introducei fraza-parol; aceasta este o propoziie secret \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4650,7 +4654,7 @@ msgstr ""
"O s o fac oricum. Putei schimba fraza-parol oricnd, folosind acest\n"
"program cu opiunea \"--edit-key\".\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4662,50 +4666,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:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulat.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scriu cheia public n `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scriu talonul (stub) cheii secrete n `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scriu cheia secret n `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, 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:3545
+#: g10/keygen.c:3573
#, 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:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "cheile secret i public au fost create i semnate.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4715,12 +4719,12 @@ msgstr ""
"s folosii comanda \"--edit-key\" pentru a genera o subcheie secundar\n"
"pentru acest scop.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a euat: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4728,7 +4732,7 @@ msgstr ""
"cheia a fost creat %lu secund n viitor (warp n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4736,25 +4740,25 @@ msgstr ""
"cheia a fost creat %lu secunde n viitor (warp n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Creai ntr-adevr? (d/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "stocarea cheii pe card a euat: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nu pot crea fiier de rezerv `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "NOT: copia de sigurana a cheii cardului salvat la `%s'\n"
@@ -5454,7 +5458,7 @@ msgstr "cheia %u-bit %s, ID %s, creat %s"
msgid " (subkey on main key ID %s)"
msgstr " (subcheie pe cheia principal ID %s)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5470,34 +5474,34 @@ msgstr ""
"foarte larg!\n"
"ncercai s folosii o imagine de aproximativ 240x288 pixeli.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Introducei nume-fiier JPEG pentru poz ID: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "nu pot deschide fiierul JPEG `%s': %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Acest JPEG este foarte mare (%d octei) !\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Suntei sigur() c dorii s l folosii? (d/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "`%s' nu este un fiier JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Este aceast poz corect (d/N/t)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "nu pot afia poza ID!\n"
diff --git a/po/ru.po b/po/ru.po
index 377668319..584315369 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 2.0.10\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2008-12-21 00:40+0200\n"
"Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -91,7 +91,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -100,7 +100,7 @@ msgstr "не могу создать `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1205,7 +1205,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s \n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "невозможно сделать это в пакетном режиме\n"
@@ -3407,19 +3407,19 @@ msgstr "не удалось подписать: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Данный ключ не защищен.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретная часть главного ключа отсутствует.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Секретная часть главного ключа сохранена на карте.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Ключ защищен.\n"
@@ -3436,7 +3436,7 @@ msgstr ""
"Введите новую фразу-пароль для данного секретного ключа.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
@@ -4190,13 +4190,13 @@ msgid "writing key binding signature\n"
msgstr "сохраняем объединяющую подпись\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "неверный размер ключа; используется %u бит\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "размер ключа приведен к %u битам\n"
@@ -4406,7 +4406,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Все верно? (y/N) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4420,7 +4420,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4435,44 +4435,44 @@ msgstr ""
" \"Baba Yaga (pensioner) <yaga@deepforest.ru>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Ваше настоящее имя: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Недопустимый символ в Имени\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Имя не должно начинаться с цифры\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Имя не должно быть короче 5 символов\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "Email-адрес: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Неправильный e-mail адрес\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Комментарий: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Недопустимый символ в комментарии\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Используемая таблица символов: `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4483,10 +4483,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4498,24 +4502,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
-#: g10/keygen.c:2168
+#: g10/keygen.c:2203
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
-#: g10/keygen.c:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Сначала исправьте ошибку\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4523,19 +4527,19 @@ msgstr ""
"Для защиты секретного ключа необходима фраза-пароль.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4547,7 +4551,7 @@ msgstr ""
"запустив данную программу с ключом \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4560,50 +4564,50 @@ msgstr ""
"обращения к дискам) в процессе генерации; это даст генератору\n"
"случайных чисел возможность получить лучшую энтропию.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "сохранение открытого ключа в `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "сохранение заглушки секретного ключа в `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "сохранение секретного ключа в `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "открытый и закрытый ключи созданы и подписаны.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4611,44 +4615,44 @@ msgstr ""
"Учтите, данный ключ не может использоваться для шифрования. Можно\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N)"
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "сбой сохранения ключа на карту: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "не могу создать резервную копию, файл `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
@@ -5343,7 +5347,7 @@ msgstr "%u-бит %s ключ, ID %s, создан %s"
msgid " (subkey on main key ID %s)"
msgstr " (подключ на главном ключе %s)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5357,34 +5361,34 @@ msgstr ""
"с Вашим открытым ключом и увеличит его размер, т.е. не следует брать очень\n"
"большое изображение. Рекомендуемый размер около 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Введите имя JPEG файла для Фото ID: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "Не могу открыть JPEG файл `%s': %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Этот JPEG очень велик (%d байт)!\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Действительно хотите использовать его? (y/N)"
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "`%s' - не JPEG файл\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Данное фото правильное (y/N/q)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "не могу отобразить Фото ID!\n"
diff --git a/po/sk.po b/po/sk.po
index e5a60c754..16343395c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+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"
@@ -92,7 +92,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ochrann algoritmus %d%s nie je podporovn\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -101,7 +101,7 @@ msgstr "nemem vytvori `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1231,7 +1231,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr ""
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemono previes v dvkovom mde\n"
@@ -3539,20 +3539,20 @@ msgstr "podpisovanie zlyhalo: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Tento k nie je chrnen.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn asti primrneho ka nie s dostupn.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Tajn asti primrneho ka nie s dostupn.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "k je chrnen.\n"
@@ -3569,7 +3569,7 @@ msgstr ""
"Vlote nov heslo (passphrase) pre tento tajn k.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nie je zopakovan sprvne; skste to znovu"
@@ -4375,13 +4375,13 @@ msgid "writing key binding signature\n"
msgstr "zapisujem \"key-binding\" podpis\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn dka ka; pouijem %u bitov\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dka ka zaokrhlen na %u bitov\n"
@@ -4594,7 +4594,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Je to sprvne (a/n)? "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4605,7 +4605,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
#, fuzzy
msgid ""
"\n"
@@ -4622,44 +4622,44 @@ msgstr ""
" \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Meno a priezvisko: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Neplatn znak ve mene\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Meno neme zana slicou\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Meno mus by dlh aspo 5 znakov\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "E-mailov adresa: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "Neplatn e-mailov adresa\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Komentr: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Neplatn znak v komentri\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pouvate znakov sadu `%s'.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4670,10 +4670,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4685,23 +4689,23 @@ msgstr "Do poa meno alebo komentr nepte, prosm, e-mailov adresu.\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "mMkKeEPpUu"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Najskr, prosm, opravte chybu\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4709,19 +4713,19 @@ msgstr ""
"Na ochranu Vho tajnho ka muste zada heslo.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "Prosm, vlote heslo; toto je tajn veta \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4733,7 +4737,7 @@ msgstr ""
"tohto programu s parametrom \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4745,50 +4749,50 @@ msgstr ""
"pouva disky); vaka tomu m genertor lepiu ancu zska dostatok "
"entropie.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Vytvranie ka bolo zruen.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisujem verejn k do `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisujem tajn k do `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenjden zapisovaten sbor verejnch kov (pubring): %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenjden zapisovaten sbor tajnch kov (secring): %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pri zpise do sboru verejnch kov `%s': %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pri zpise do sboru tajnch kov `%s': %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "verejn a tajn k boli vytvoren a podpsan.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -4797,12 +4801,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie ka sa nepodarilo: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4810,7 +4814,7 @@ msgstr ""
"k bol vytvoren %lu sekund v budcnosti (dolo k zmene asu alebo\n"
"je problm so systmovm asom)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4818,26 +4822,26 @@ msgstr ""
"k bol vytvoren %lu sekund v budcnosti (dolo k zmene asu alebo\n"
"je problm so systmovm asom)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skutone vytvori? "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, fuzzy, c-format
msgid "storing key onto card failed: %s\n"
msgstr "zmazanie bloku ka sa nepodarilo: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, fuzzy, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "nemem vytvori `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, fuzzy, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "POZNMKA: platnos tajnho ka %08lX skonila %s\n"
@@ -5547,7 +5551,7 @@ msgstr "dka %u bitov, typ %s, ID %08lX, vytvoren %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5562,35 +5566,35 @@ msgstr ""
"Ak pouijete vemi vek obrzok, k bude tie vek! Odporan vekos\n"
"obrzka je okolo 240x288.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Meno sbor s fotografiou vo formte JPEG: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, fuzzy, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "nemono otvori sbor: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Are you sure you want to use it? (y/N) "
msgstr "Ste si ist, e ho chcete poui? (a/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, fuzzy, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\" nie je sbor JPEG\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Je tto fotografia sprvna (a/N/u)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "nemono nastavi exec-path na %s\n"
diff --git a/po/sv.po b/po/sv.po
index 06f5f2776..b0b9a4776 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg trunk\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2008-07-21 09:04+0200\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -116,7 +116,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh-nycklar större än %d bitar stöds inte\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -125,7 +125,7 @@ msgstr "kan inte skapa \"%s\": %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1242,7 +1242,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kort nr. %s identifierades\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i satsläge\n"
@@ -3492,19 +3492,19 @@ msgstr ""
"Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
"att ändra.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Denna nyckel är inte skyddad.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Nyckeln är skyddad.\n"
@@ -3521,7 +3521,7 @@ msgstr ""
"Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "lösenfrasen repeterades inte korrekt; försök igen."
@@ -4298,13 +4298,13 @@ msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@ -4520,7 +4520,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Stämmer detta? (j/N) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4535,7 +4535,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4553,44 +4553,44 @@ msgstr ""
" \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Namn: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Namnet får inte börja med en siffra\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "E-postadress: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "E-postadressen är ogiltig\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du använder teckentabellen \"%s\"\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4601,10 +4601,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
# Ej solklart vad förkortningarna står för
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
@@ -4617,24 +4621,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Rätta först felet\n"
# fel kapitalisering i originalet?
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4642,7 +4646,7 @@ msgstr ""
"Du behöver en lösenfras för att skydda din hemliga nyckel\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@ -4650,12 +4654,12 @@ msgid ""
msgstr ""
"Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4667,7 +4671,7 @@ msgstr ""
"om du använder detta program med flaggan \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4679,51 +4683,51 @@ msgstr ""
"hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver den publika nyckeln till \"%s\"\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemliga nyckelstumpen till \"%s\"\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
# Flagga.. inte kommando
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4732,13 +4736,13 @@ msgstr ""
"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
"syfte.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
# c-format behövs inte i singularis
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -4746,7 +4750,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:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4754,25 +4758,25 @@ msgstr ""
"nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
"relaterat till tidsresande eller en felställd klocka)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Verkligen skapa? (j/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
@@ -5475,7 +5479,7 @@ msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
msgid " (subkey on main key ID %s)"
msgstr " (undernyckel på primärt nyckel-id %s)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5489,35 +5493,35 @@ msgstr ""
"en mycket stor bild, så blir din nyckel också väldigt stor!\n"
"Försök att använda en bild som har ungefär formatet 240x288 pixlar.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Skriv JPEG-filnamnet för foto-id: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "kunde inte öppna JPEG-filen \"%s\": %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Den här JPEG-bilden är verkligen stor (%d byte)!\n"
# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Vill du verkligen använda den? (j/N)? "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "\"%s\" är inte en JPEG-fil\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Är detta foto korrekt (j/N/a)? "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "kan inte visa foto-id!\n"
diff --git a/po/tr.po b/po/tr.po
index 77ff7c1a6..596f373b1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.10rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2008-12-14 23:25+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
"Language-Team: Turkish\n"
@@ -93,7 +93,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -102,7 +102,7 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1205,7 +1205,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "%s numaralı OpenPGP kartı saptandı\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
@@ -3426,19 +3426,19 @@ msgstr ""
"Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
"değiştirilecek bir anahtar parolası yok.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "Bu anahtar korunmamış.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
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:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "Anahtar korunmuş.\n"
@@ -3455,7 +3455,7 @@ msgstr ""
"Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr ""
"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -4257,13 +4257,13 @@ msgid "writing key binding signature\n"
msgstr "anahtarı garantileyen imzayı yazıyor\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -4473,7 +4473,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "Bu doğru mu? (e/H ya da y/N) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4488,7 +4488,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4504,44 +4504,44 @@ msgstr ""
"\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "Adınız ve Soyadınız: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "Ad ve soyadınızda geçersiz karakter var\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
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:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "E-posta adresiniz: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "geçerli bir E-posta adresi değil\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "Önbilgi: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "Önbilgi alanında geçersiz karakter var\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4552,11 +4552,15 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
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"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4568,24 +4572,24 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "AaYyEeTtKk"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
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:2168
+#: g10/keygen.c:2203
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:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "Lütfen önce hatayı düzeltin\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4593,7 +4597,7 @@ msgstr ""
"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
@@ -4602,12 +4606,12 @@ msgstr ""
"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
"giriniz."
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4619,7 +4623,7 @@ msgstr ""
"seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4632,50 +4636,50 @@ msgstr ""
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "genel anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gizli anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4683,19 +4687,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:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4703,26 +4707,26 @@ msgstr ""
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
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:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, 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:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -5415,7 +5419,7 @@ msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
msgid " (subkey on main key ID %s)"
msgstr " (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5429,34 +5433,34 @@ msgstr ""
"bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
"boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "JPEG dosyası `%s' açılamıyor: %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "Bu JPEG gerçekten büyük (%d bayt)!\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H ya da y/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "'%s' bir JPEG dosyası değil\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "Bu foto doğru mu? (e/H/ç veya y/N/ç) "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "foto kimliği gösterilemiyor!\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8a9efb34b..5c106c9f2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2009-07-09 10:03+0200\n"
"Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -99,7 +99,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -108,7 +108,7 @@ msgstr "无法建立‘%s’:%s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1236,7 +1236,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@ -3416,19 +3416,19 @@ msgstr "签名时失败: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -3445,7 +3445,7 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符;请再试一次"
@@ -4200,13 +4200,13 @@ msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效:改用 %u 位\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4414,7 +4414,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "以上正确吗?(y/n)"
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4425,7 +4425,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4441,44 +4441,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "真实姓名:"
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "电子邮件地址:"
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "注释:"
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4489,10 +4489,14 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4504,23 +4508,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
-#: g10/keygen.c:2168
+#: g10/keygen.c:2203
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
-#: g10/keygen.c:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4528,19 +4532,19 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
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"
@@ -4552,7 +4556,7 @@ msgstr ""
"再次执行这个程序,并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4562,50 +4566,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环:%s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4613,42 +4617,42 @@ msgstr ""
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败:%s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意:卡密钥的备份已保存到‘%s’\n"
@@ -5333,7 +5337,7 @@ msgstr "%u 位的 %s 密钥,钥匙号 %s,建立于 %s"
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5346,34 +5350,34 @@ msgstr ""
"片会被存放在您的公钥里。如果您挑了非常大的图片的话,您的密钥也会变得非\n"
"常大!请尽量把图片尺寸控制在240x288左右,这是个理想的尺寸。\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "输入要当作相片标识的JPEG文件名: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "无法打开 JPEG 文件‘%s’:%s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "这个 JPEG 文件太大了(%d 字节)!\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "您确定要用它吗?(y/N)"
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "“%s”不是一个 JPEG 文件\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "这张照片正确吗?(y/N/q)"
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "无法显示照片标识!\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2ec37ef6e..28e1fc9e6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.0.10rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-09-03 12:26+0200\n"
+"POT-Creation-Date: 2009-09-03 21:36+0200\n"
"PO-Revision-Date: 2009-09-03 02:47+0800\n"
"Last-Translator: Jedi <JediLin@Gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -95,7 +95,7 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
-#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -104,7 +104,7 @@ msgstr "無法建立 `%s': %s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2845
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -1184,7 +1184,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
@@ -3355,19 +3355,19 @@ msgstr "簽署時失敗: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3713
+#: g10/keyedit.c:1142 g10/keygen.c:3741
msgid "This key is not protected.\n"
msgstr "這把金鑰未被保護.\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分無法取用.\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3716
+#: g10/keyedit.c:1150 g10/keygen.c:3744
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上.\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3720
+#: g10/keyedit.c:1156 g10/keygen.c:3748
msgid "Key is protected.\n"
msgstr "金鑰已保護.\n"
@@ -3384,7 +3384,7 @@ msgstr ""
"請輸入要給這把私鑰用的新密語.\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2247
+#: g10/keyedit.c:1207 g10/keygen.c:2282
msgid "passphrase not correctly repeated; try again"
msgstr "前後兩次輸入的密語不一致; 請再試一次"
@@ -4140,13 +4140,13 @@ msgid "writing key binding signature\n"
msgstr "寫入附鑰簽章中\n"
#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3209
+#: g10/keygen.c:3237
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "金鑰尺寸無效; 改用 %u 位元\n"
#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3215
+#: g10/keygen.c:3243
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -4354,7 +4354,7 @@ msgstr ""
msgid "Is this correct? (y/N) "
msgstr "以上正確嗎? (y/N) "
-#: g10/keygen.c:2034
+#: g10/keygen.c:2054
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4368,7 +4368,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2049
+#: g10/keygen.c:2069
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4383,44 +4383,44 @@ msgstr ""
" \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
"\n"
-#: g10/keygen.c:2068
+#: g10/keygen.c:2088
msgid "Real name: "
msgstr "真實姓名: "
-#: g10/keygen.c:2076
+#: g10/keygen.c:2096
msgid "Invalid character in name\n"
msgstr "姓名含有無效的字符\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2098
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用數字開頭\n"
-#: g10/keygen.c:2080
+#: g10/keygen.c:2100
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五個字符長\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2108
msgid "Email address: "
msgstr "電子郵件地址: "
-#: g10/keygen.c:2094
+#: g10/keygen.c:2114
msgid "Not a valid email address\n"
msgstr "不是有效的電子郵件地址\n"
-#: g10/keygen.c:2102
+#: g10/keygen.c:2122
msgid "Comment: "
msgstr "註釋: "
-#: g10/keygen.c:2108
+#: g10/keygen.c:2128
msgid "Invalid character in comment\n"
msgstr "註釋含有無效的字符\n"
-#: g10/keygen.c:2130
+#: g10/keygen.c:2150
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "你正在使用 `%s' 字元集.\n"
-#: g10/keygen.c:2136
+#: g10/keygen.c:2156
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4431,10 +4431,14 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:2141
+#: g10/keygen.c:2161
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
+#: g10/keygen.c:2176
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
#. string which should be translated accordingly and the
@@ -4446,23 +4450,23 @@ msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2157
+#: g10/keygen.c:2192
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2167
+#: g10/keygen.c:2202
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
-#: g10/keygen.c:2168
+#: g10/keygen.c:2203
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
-#: g10/keygen.c:2187
+#: g10/keygen.c:2222
msgid "Please correct the error first\n"
msgstr "請先訂正錯誤\n"
-#: g10/keygen.c:2229
+#: g10/keygen.c:2264
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4470,18 +4474,18 @@ msgstr ""
"你需要一個密語來保護你的私鑰.\n"
"\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2267
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "請輸入密語以保護新加密金鑰的卡片外備份."
-#: g10/keygen.c:2248
+#: g10/keygen.c:2283
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2254
+#: g10/keygen.c:2289
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4493,7 +4497,7 @@ msgstr ""
"僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
"\n"
-#: g10/keygen.c:2278
+#: g10/keygen.c:2313
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"
@@ -4504,50 +4508,50 @@ msgstr ""
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
-#: g10/keygen.c:3149 g10/keygen.c:3176
+#: g10/keygen.c:3177 g10/keygen.c:3204
msgid "Key generation canceled.\n"
msgstr "金鑰產生已取消.\n"
-#: g10/keygen.c:3381 g10/keygen.c:3551
+#: g10/keygen.c:3409 g10/keygen.c:3579
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在寫入公鑰至 `%s'\n"
-#: g10/keygen.c:3383 g10/keygen.c:3554
+#: g10/keygen.c:3411 g10/keygen.c:3582
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "正在寫入私鑰 stub 至 `%s'\n"
-#: g10/keygen.c:3386 g10/keygen.c:3557
+#: g10/keygen.c:3414 g10/keygen.c:3585
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在寫入私鑰至 `%s'\n"
-#: g10/keygen.c:3538
+#: g10/keygen.c:3566
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
-#: g10/keygen.c:3545
+#: g10/keygen.c:3573
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
-#: g10/keygen.c:3565
+#: g10/keygen.c:3593
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3601
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
-#: g10/keygen.c:3600
+#: g10/keygen.c:3628
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已建立及簽署.\n"
-#: g10/keygen.c:3611
+#: g10/keygen.c:3639
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"
@@ -4555,42 +4559,42 @@ msgstr ""
"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
"來產生加密用的子鑰.\n"
-#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
+#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
-#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
+#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
-#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
+#: g10/keygen.c:3710 g10/keygen.c:3851 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
-#: g10/keygen.c:3693 g10/keygen.c:3834
+#: g10/keygen.c:3721 g10/keygen.c:3862
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
-#: g10/keygen.c:3734 g10/keygen.c:3867
+#: g10/keygen.c:3762 g10/keygen.c:3895
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
-#: g10/keygen.c:4055
+#: g10/keygen.c:4083
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "儲存金鑰到卡片上時失敗: %s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4132
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "無法建立備份檔案 `%s': %s\n"
-#: g10/keygen.c:4130
+#: g10/keygen.c:4158
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -5277,7 +5281,7 @@ msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
msgid " (subkey on main key ID %s)"
msgstr " (在主鑰 ID %s 上的子鑰)"
-#: g10/photoid.c:73
+#: g10/photoid.c:74
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5291,34 +5295,34 @@ msgstr ""
"你的金鑰也會變成非常地大!\n"
"盡量把圖片尺寸控制在 240x288 左右, 會是個非常理想的大小.\n"
-#: g10/photoid.c:95
+#: g10/photoid.c:96
msgid "Enter JPEG filename for photo ID: "
msgstr "輸入要當作照片 ID 的 JPEG 檔名: "
-#: g10/photoid.c:116
+#: g10/photoid.c:117
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "無法開啟 JPEG 圖檔 `%s': %s\n"
-#: g10/photoid.c:127
+#: g10/photoid.c:128
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "這個 JPEG 檔案真的很大 (%d 位元組) !\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Are you sure you want to use it? (y/N) "
msgstr "你確定要用它嗎? (y/N) "
-#: g10/photoid.c:146
+#: g10/photoid.c:147
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "`%s' 不是一個 JPEG 圖檔\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:166
msgid "Is this photo correct (y/N/q)? "
msgstr "這張照片正確嗎? (y/N/q) "
-#: g10/photoid.c:373
+#: g10/photoid.c:374
msgid "unable to display photo ID!\n"
msgstr "無法顯示照片 ID!\n"