aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2000-07-05 11:28:59 +0000
committerWerner Koch <[email protected]>2000-07-05 11:28:59 +0000
commit836f226479776b219d2a3ed22507ee4bc3706b82 (patch)
tree0f3094d6aa738ecf4a6edffdb5f3ba5fcd7e802a
parentSee ChangeLog: Wed Jun 28 11:54:44 CEST 2000 Werner Koch (diff)
downloadgnupg-836f226479776b219d2a3ed22507ee4bc3706b82.tar.gz
gnupg-836f226479776b219d2a3ed22507ee4bc3706b82.zip
See ChangeLog: Wed Jul 5 13:28:45 CEST 2000 Werner Koch
-rw-r--r--VERSION2
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/DETAILS48
-rw-r--r--doc/FAQ16
-rw-r--r--g10/ChangeLog7
-rw-r--r--g10/keyedit.c15
-rw-r--r--g10/keyid.c3
-rw-r--r--po/ChangeLog4
-rw-r--r--po/de.po130
-rw-r--r--po/eo.po130
-rw-r--r--po/es_ES.po130
-rw-r--r--po/fr.po143
-rw-r--r--po/id.po130
-rw-r--r--po/it.po130
-rw-r--r--po/ja.po130
-rw-r--r--po/nl.po130
-rw-r--r--po/pl.po130
-rw-r--r--po/pt_BR.po130
-rw-r--r--po/pt_PT.po130
-rw-r--r--po/ru.po130
-rw-r--r--po/sv.po130
-rw-r--r--tools/ChangeLog4
-rw-r--r--tools/Makefile.am2
-rwxr-xr-xtools/mail-signed-keys75
-rw-r--r--util/argparse.c16
25 files changed, 1063 insertions, 836 deletions
diff --git a/VERSION b/VERSION
index 36beb0f0e..a4a1d192c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.1h
+1.0.1i
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a877cf5aa..59efbc95e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-03 13:59:24 Werner Koch ([email protected])
+
+ * DETAILS, FAQ: Typo fixes by Yosiaki IIDA.
+
2000-05-12 10:57:21 Werner Koch ([email protected])
* gpg.sgml: Documented --no-tty.
diff --git a/doc/DETAILS b/doc/DETAILS
index ac8b577a8..14715a827 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -119,7 +119,7 @@ more arguments in future versions.
The signature key has expired. No arguments yet.
KEYREVOKED
- The used key has been revoked by his owner. No arguments yet.
+ The used key has been revoked by its owner. No arguments yet.
BADARMOR
The ASCII armor is corrupted. No arguments yet.
@@ -198,7 +198,7 @@ more arguments in future versions.
BEGIN_DECRYPTION
END_DECRYPTION
Mark the start and end of the actual decryption process. These
- are also emmited when in --list-only mode.
+ are also emitted when in --list-only mode.
BEGIN_ENCRYPTION
END_ENCRYPTION
@@ -214,7 +214,7 @@ more arguments in future versions.
"char" is the character displayed with no --status-fd enabled, with
the linefeed replaced by an 'X'. "cur" is the current amount
done and "total" is amount to be done; a "total" of 0 indicates that
- the toatal amount is not known. 100/100 may be used to detect the
+ the total amount is not known. 100/100 may be used to detect the
end of operation.
SIG_CREATED <type> <pubkey algo> <hash algo> <class> <timestamp> <key fpr>
@@ -263,31 +263,31 @@ Unattended key generation
There is an experimental feature which allows for unattended
generation of keys controlled by a parameter file.
This feature is not very well tested and does only make sense for some
-very special applications. Please don't complain if we decide to chnage
+very special applications. Please don't complain if we decide to change
the behaviour of this command.
To use this feature, you use --gen-key together with --batch and feed the
-parameters either form stdin or from a file given on the commandline.
+parameters either from stdin or from a file given on the commandline.
The format of this file is as follows:
o Text only, line length is limited to about 1000 chars.
- o You must use UTF-8 encoding to specifiy non-ascii characters.
- o Empty lines are ignored
- o Leading and trailing spaces are ignored
- o A hash sign as the first non white space character indicates a comment line
+ o You must use UTF-8 encoding to specify non-ascii characters.
+ o Empty lines are ignored.
+ o Leading and trailing spaces are ignored.
+ o A hash sign as the first non white space character indicates a comment line.
o Control statements are indicated by a leading percent sign, the
arguments are separated by white space from the keyword.
o Parameters are specified by a keyword, followed by a colon. Arguments
- are speparated by white space.
+ are separated by white space.
o The first parameter must be "Key-Type", control statements
may be placed anywhere.
o Key generation takes place when either the end of the parameter file
is reached, the next "Key-Type" parameter is encountered or at the
controlstatement "%commit"
- o Control staements:
+ o Control statements:
%echo <text>
- Print <text>
+ Print <text>.
%dry-run
- Suppress actual key generation (useful for syntax checking)
+ Suppress actual key generation (useful for syntax checking).
%commit
Perform the key generation. An implicit commit is done
at the next "Key-Type" parameter.
@@ -302,8 +302,8 @@ The format of this file is as follows:
this file is created (and overwrites an existing one).
Both control statements must be given.
o The order of the parameters does not matter except for "Key-Type"
- which must be the first parameter. The paramtyers are only for the
- generated keyblock and paramters from previous key generations are not
+ which must be the first parameter. The parameters are only for the
+ generated keyblock and parameters from previous key generations are not
used. Some syntactically checks may be performed.
The currently defined parameters are:
Key-Type: <algo-number>|<algo-string>
@@ -311,7 +311,7 @@ The format of this file is as follows:
primary key. The algorithm must be capable of signing.
This is a required parameter.
Key-Length: <length-in-bits>
- Length of the key in bits. Default is 1024
+ Length of the key in bits. Default is 1024.
Subkey-Type: <algo-number>|<algo-string>
This generates a secondary key. Currently only one subkey
can be handled.
@@ -476,16 +476,16 @@ the DB is always of type 1 and this is the only record of this type.
1 u32 next next sigrec of this uid or 0 to indicate the
last sigrec.
6 times
- 1 u32 Local_id of signators dir or shadow dir record
+ 1 u32 Local_id of signatures dir or shadow dir record
1 byte Flag: Bit 0 = checked: Bit 1 is valid (we have a real
directory record for this)
- 1 = valid is set (but my be revoked)
+ 1 = valid is set (but may be revoked)
Record type 8: (shadow directory record)
--------------
- This record is used to reserved a LID for a public key. We
+ This record is used to reserve a LID for a public key. We
need this to create the sig records of other keys, even if we
do not yet have the public key of the signature.
This record (the record number to be more precise) will be reused
@@ -614,7 +614,7 @@ There is one enhancement used with the old style packet headers:
+ future extensions. These length markers must be inserted into the data
+ stream just before writing the data out.
+
-+ This 2 byte filed is large enough, because the application must buffer
++ This 2 byte field is large enough, because the application must buffer
+ this amount of data to prepend the length marker before writing it out.
+ Data block sizes larger than about 32k doesn't make any sense. Note
+ that this may also be used for compressed data streams, but we must use
@@ -633,8 +633,8 @@ GNU protection mode - 1000. Defined modes are:
Usage of gdbm files for keyrings
================================
- The key to store the keyblock is it's fingerprint, other records
- are used for secondary keys. fingerprints are always 20 bytes
+ The key to store the keyblock is its fingerprint, other records
+ are used for secondary keys. Fingerprints are always 20 bytes
where 16 bit fingerprints are appended with zero.
The first byte of the key gives some information on the type of the
key.
@@ -742,11 +742,11 @@ The keyserver also recognizes http-POSTs to /pks/add. Use this to upload
keys.
-A better way to to this would be a request like:
+A better way to do this would be a request like:
/pks/lookup/<gnupg_formatierte_user_id>?op=<operation>
-this can be implemented using Hurd's translator mechanism.
+This can be implemented using Hurd's translator mechanism.
However, I think the whole key server stuff has to be re-thought;
I have some ideas and probably create a white paper.
diff --git a/doc/FAQ b/doc/FAQ
index bbfb27df3..3289a7fdd 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -126,7 +126,7 @@
gpg --rfc1991 --cipher-algo 3des ...
Please don't pipe the data to encrypt to gpg but give it as a filename;
- other wise, pgp 2 will not be able to handle it.
+ otherwise, pgp 2 will not be able to handle it.
Q: How can I conventional encrypt a message, so that PGP can decrypt it?
A: You can't do this for PGP 2. For PGP 5 you should use this:
@@ -145,7 +145,7 @@
we (on Linux the /dev/random device) must collect some random data.
It is really not easy to fill the Linux internal entropy buffer; I
talked to Ted Ts'o and he commented that the best way to fill the buffer
- is to play with your keyboard. Good security has it's price. What I do
+ is to play with your keyboard. Good security has its price. What I do
is to hit several times on the shift, control, alternate, and capslock
keys, because these keys do not produce output to the screen. This way
you get your keys really fast (it's the same thing pgp2 does).
@@ -187,7 +187,7 @@
q = Undefined (no value assigned)
n = Don't trust this key at all
m = There is marginal trust in this key
- f = The key is full trusted.
+ f = The key is full trusted
u = The key is ultimately trusted; this
is only used for keys for which
the secret key is also available.
@@ -282,7 +282,7 @@
other keys. "validity", or calculated trust, is a value which
says how much GnuPG thinks a key is valid (that it really belongs
to the one who claims to be the owner of the key).
- For more see the chapter "The Web of Trust" in the Manual
+ For more see the chapter "The Web of Trust" in the Manual.
Q: How do I interpret some of the informational outputs?
A: While checking the validity of a key, GnuPG sometimes prints
@@ -342,7 +342,7 @@
where pgpkeyring is the original keyring and not the GnuPG one you
might have created in the first step.
- Q: Are the headerlines of a cleartext signater part of the signed
+ Q: Are the headerlines of a cleartext signature part of the signed
material?
A: No. For example you can add or remove "Comment:" lines. They
have a purpose like the mail header lines. However a "Hash:"
@@ -357,7 +357,7 @@
Q: PGP 5.x, 6.x does not like my secret key.
A: PGP probably bails out on some private comment packets used by GnuPG.
These packets are fully in compliance with OpenPGP; however PGP is not
- really OpenPGP aware. A workaround is to eport the secret keys with
+ really OpenPGP aware. A workaround is to export the secret keys with
this command:
gpg --export-secret-keys --no-comment -a your-key-id
@@ -376,7 +376,7 @@
A: You should use the option --batch and don't use passphrases as
there is usually no way to store it more secure than the secret
keyring itself. The suggested way to create the keys for the
- automated envirionment ist:
+ automated environment is:
On a secure machine:
1. If you want to do automatic signing, create a signing subkey
for your key (edit menu, choose "addkey" and the DSA).
@@ -384,7 +384,7 @@
implementation)
3. gpg --export-secret-subkeys --no-comment foo >secring.auto
4. Copy secring.auto and the public keyring to a test directory.
- 5. Cd to this diectory
+ 5. Cd to this directory.
6. gpg --homedir . --edit foo
and use "passwd" to remove the passphrase from the subkeys.
You may also want to remove all unused subkeys.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 30032047d..e231e6952 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 5 13:28:45 CEST 2000 Werner Koch <wk@>
+
+ * keyedit.c, keyid.c: Add some _()
+
+ * argparse.c: Changed the flag to suppress --version handling to also
+ suppress --help.
+
Wed Jun 28 11:54:44 CEST 2000 Werner Koch <wk@>
* armor.c (armor_filter): Set sigclass to 0 in case of non-dash-escaped
diff --git a/g10/keyedit.c b/g10/keyedit.c
index cd297db60..b28fadb45 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1077,7 +1077,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked,
otrust = get_ownertrust_info( pk->local_id );
}
- tty_printf("%s%c %4u%c/%08lX created: %s expires: %s",
+ tty_printf(_("%s%c %4u%c/%08lX created: %s expires: %s"),
node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub",
(node->flag & NODFLG_SELKEY)? '*':' ',
nbits_from_pk( pk ),
@@ -1086,7 +1086,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked,
datestr_from_pk(pk),
expirestr_from_pk(pk) );
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
- tty_printf(" trust: %c/%c", otrust, trust );
+ tty_printf(_(" trust: %c/%c"), otrust, trust );
if( node->pkt->pkttype == PKT_PUBLIC_KEY
&& (get_ownertrust( pk->local_id )&TRUST_FLAG_DISABLED)) {
tty_printf("\n*** ");
@@ -1103,7 +1103,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked,
else if( node->pkt->pkttype == PKT_SECRET_KEY
|| (with_subkeys && node->pkt->pkttype == PKT_SECRET_SUBKEY) ) {
PKT_secret_key *sk = node->pkt->pkt.secret_key;
- tty_printf("%s%c %4u%c/%08lX created: %s expires: %s\n",
+ tty_printf(_("%s%c %4u%c/%08lX created: %s expires: %s"),
node->pkt->pkttype == PKT_SECRET_KEY? "sec":"ssb",
(node->flag & NODFLG_SELKEY)? '*':' ',
nbits_from_sk( sk ),
@@ -1111,6 +1111,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked,
(ulong)keyid_from_sk(sk,NULL),
datestr_from_sk(sk),
expirestr_from_sk(sk) );
+ tty_printf("\n");
}
else if( with_subkeys && node->pkt->pkttype == PKT_SIGNATURE
&& node->pkt->pkt.signature->sig_class == 0x28 ) {
@@ -1118,12 +1119,12 @@ show_key_with_all_names( KBNODE keyblock, int only_marked,
rc = check_key_signature( keyblock, node, NULL );
if( !rc )
- tty_printf( "rev! subkey has been revoked: %s\n",
+ tty_printf( _("rev! subkey has been revoked: %s\n"),
datestr_from_sig( sig ) );
else if( rc == G10ERR_BAD_SIGN )
- tty_printf( "rev- faked revocation found\n" );
+ tty_printf( _("rev- faked revocation found\n") );
else if( rc )
- tty_printf( "rev? problem checking revocation: %s\n",
+ tty_printf( _("rev? problem checking revocation: %s\n"),
g10_errstr(rc) );
}
}
@@ -1184,7 +1185,7 @@ show_fingerprint( PKT_public_key *pk )
fingerprint_from_pk( pk, array, &n );
p = array;
- tty_printf(" Fingerprint:");
+ tty_printf(_(" Fingerprint:"));
if( n == 20 ) {
for(i=0; i < n ; i++, i++, p += 2 ) {
if( i == 10 )
diff --git a/g10/keyid.c b/g10/keyid.c
index d56c58711..a862a8cdd 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -31,6 +31,7 @@
#include "options.h"
#include "mpi.h"
#include "keydb.h"
+#include "i18n.h"
int
@@ -309,7 +310,7 @@ expirestr_from_pk( PKT_public_key *pk )
time_t atime;
if( !pk->expiredate )
- return "never ";
+ return _("never ");
atime = pk->expiredate;
tp = gmtime( &atime );
sprintf(buffer,"%04d-%02d-%02d", 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday );
diff --git a/po/ChangeLog b/po/ChangeLog
index 2b596d90f..85b039184 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 5 13:28:45 CEST 2000 Werner Koch <wk@>
+
+ * fr.po: Minor changes by Gael
+
Wed Jun 14 12:27:09 CEST 2000 Werner Koch <[email protected]>
* de.po, de.glo: Updated.
diff --git a/po/de.po b/po/de.po
index fc684a212..6f6e5e4b9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 2000-06-12 12:50+0200\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
@@ -257,7 +257,7 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -1273,55 +1273,60 @@ msgstr "Die Eigenbeglaubigung wird geschrieben\n"
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA und ElGamal (voreingestellt)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur signieren/beglaubigen)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur verschl�sseln)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Ihre Auswahl? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr ""
"M�chten Sie wirklich einen Unterschriften-/Verschl�sselungschl�ssel "
"erzeugen? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Ung�ltige Auswahl.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1334,18 +1339,23 @@ msgstr ""
" standard Schl�ssell�nge ist 1024 Bit\n"
" gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA erlaubt nur Schl�ssell�ngen von 512 bis 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1354,12 +1364,12 @@ msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "Sch�sselgr��e zu hoch; %d ist der Maximalwert.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1367,11 +1377,11 @@ msgstr ""
"Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
"Berechnungen dann WIRKLICH lange brauchen!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1379,21 +1389,21 @@ msgstr ""
"Gut, aber bitte denken Sie auch daran, da� Monitor und Tastatur Daten "
"abstrahlen und diese leicht mitgelesen werden k�nnen.\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Brauchen Sie wirklich einen derartig langen Schl�ssel? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1409,25 +1419,25 @@ msgstr ""
" <n>m = Schl�ssel verf�llt nach n Monaten\n"
" <n>y = Schl�ssel verf�llt nach n Jahren\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "Der Schl�ssel bleibt wie lange g�ltig? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "Ung�ltiger Wert.\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "Der Schl�ssel verf�llt nie.\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "Der Schl�ssel verf�llt am %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1435,11 +1445,11 @@ msgstr ""
"Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
"Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "Ist dies richtig? (j/n) "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1455,44 +1465,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Ung�ltiges Zeichen im Namen\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "E-Mail-Adresse: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Ung�ltiges Zeichen im Kommentar.\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1503,27 +1513,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfBb"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
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:787
+#: g10/keygen.c:883
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:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1531,11 +1541,11 @@ msgstr ""
"Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1548,7 +1558,7 @@ msgstr ""
"aufrufen.\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1559,29 +1569,29 @@ 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:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Der DSA Schl�ssel wird 1024 Bit haben.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Schl�sselerzeugung abgebrochen.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, c-format
msgid "writing public key to `%s'\n"
msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1590,12 +1600,12 @@ msgstr ""
"werden kann. Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n"
"Zweitschl�ssel f�r diesem Zweck erzeugen.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1603,7 +1613,7 @@ msgstr ""
"Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht �berein)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1611,7 +1621,7 @@ msgstr ""
"Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht �berein)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Wirklich erzeugen? "
diff --git a/po/eo.po b/po/eo.po
index 91bab59f1..6565f140d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 2000-02-16 14:41+00:00\n"
"Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
"Language-Team: Esperanto <[email protected]>\n"
@@ -255,7 +255,7 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "vi trovis cimon ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
@@ -1246,53 +1246,58 @@ msgstr "skribas mem-subskribon\n"
msgid "writing key binding signature\n"
msgstr "skribas �losilbindan subskribon\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Petita �losilgrando estas %u bitoj\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rondigita �is %u bitoj\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur �ifri)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (subskribi kaj �ifri)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (subskribi kaj �ifri)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Via elekto? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "�u vi vere volas krei subskriban kaj �ifran �losilon? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1305,18 +1310,23 @@ msgstr ""
" implicita �losilgrando estas 1024 bitoj\n"
" plej granda rekomendata �losilgrando estas 2048 bitoj\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1325,12 +1335,12 @@ msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "�losilgrando tro granda; %d estas plej granda permesata valoro.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1338,11 +1348,11 @@ msgstr ""
"�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
"�ar la komputado da�ras TRE longe!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1350,21 +1360,21 @@ msgstr ""
"Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
"facile kaptebla!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "�u vi vere bezonas tiom grandan �losilgrandon? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Petita �losilgrando estas %u bitoj\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita �is %u bitoj\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1380,25 +1390,25 @@ msgstr ""
" <n>m = �losilo eksvalidi�os post n monatoj\n"
" <n>y = �losilo eksvalidi�os post n jaroj\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "�losilo validu ...? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "nevalida valoro\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "�losilo neniam eksvalidi�os\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "�losilo eksvalidi�os je %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1406,11 +1416,11 @@ msgstr ""
"Via sistemo ne povas montri datojn post 2038.\n"
"Tamen, �i estos �uste traktata �is 2106.\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "�u tio estas �usta (j/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1425,44 +1435,44 @@ msgstr ""
" \"Heinrich Heine (la poeto) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Vera nomo: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komenci�i per cifero\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena� 5 signojn\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Retadreso: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Komento: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1473,28 +1483,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
-#: g10/keygen.c:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1502,11 +1512,11 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "la pasfrazo ne estis �uste ripetita; provu denove.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1518,7 +1528,7 @@ msgstr ""
"uzante �i tiun programon kun la opcio \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1530,29 +1540,29 @@ msgstr ""
"kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
"akiri sufi�e da entropio.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA-�losilparo havos 1024 bitojn.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Kreado de �losiloj nuligita.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "skribas publikan atestilon al '%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "skribas sekretan atestilon al '%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1560,12 +1570,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:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1573,7 +1583,7 @@ msgstr ""
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1581,7 +1591,7 @@ msgstr ""
"�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
"horlo�eraro)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "�u vere krei? "
diff --git a/po/es_ES.po b/po/es_ES.po
index 5a4eeb589..cb0a698d4 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
# GPG version: 1.0.0
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 1999-10-27 06:35+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-13 10:49:25+0100\n"
@@ -265,7 +265,7 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no puede abrirse `%s': %s\n"
@@ -1267,53 +1267,58 @@ msgstr "escribiendo autofirma\n"
msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobaci�n de clave\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "El tama�o requerido es de %u bits\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA y ElGamal (por defecto)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (s�lo firma)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (s�lo cifrado)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (firma y cifrado)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (firma y cifrado)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Su elecci�n: "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "�De verdad quiere crear una clave de firma y cifrado? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Elecci�n no v�lida.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1326,18 +1331,23 @@ msgstr ""
" el tama�o por defecto es 1024 bits\n"
" el tama�o m�ximo recomendado es 2048 bits\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "�De qu� tama�o quiere la clave (1024)? "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1346,12 +1356,12 @@ msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1359,11 +1369,11 @@ msgstr ""
"No se recomiendan claves de m�s de 2048 bits porque\n"
"el tiempo de computaci�n es REALMENTE largo.\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "�Seguro que quiere una clave de este tama�o? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1372,21 +1382,21 @@ msgstr ""
"teclado\n"
"tambi�n son vulnerables a un ataque!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "�De verdad necesita una clave tan grande? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "El tama�o requerido es de %u bits\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1402,35 +1412,35 @@ msgstr ""
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n a�os\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "�Validez de la clave (0)? "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "valor no v�lido\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "La clave nunca caduca\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "La clave caduca el %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "�Es correcto (s/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1448,44 +1458,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Nombre y apellidos: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Caracter no v�lido en el nombre\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un n�mero\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Direcci�n de correo electr�nico: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Direcci�n no v�lida\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Caracter no v�lido en el comentario\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est� usando el juego de caracteres `%s'.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1496,28 +1506,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
-#: g10/keygen.c:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1525,11 +1535,11 @@ msgstr ""
"Necesita una contrase�a para proteger su clave secreta.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1541,7 +1551,7 @@ msgstr ""
"la opci�n \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1554,29 +1564,29 @@ msgstr ""
"generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
"entrop�a.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "El par de claves DSA tendr� 1024 bits.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Creaci�n de claves cancelada.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escribiendo certificado p�blico en `%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escribiendo certificado privado en `%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "Claves p�blica y secreta creadas y firmadas.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1585,12 +1595,12 @@ msgstr ""
"el comando \"--edit-key\" para crear una clave secundaria con este "
"prop�sito.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creaci�n de la clave fallida: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1598,7 +1608,7 @@ msgstr ""
"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1606,7 +1616,7 @@ msgstr ""
"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "�Crear de verdad? "
diff --git a/po/fr.po b/po/fr.po
index 2eafa8fdb..a61ed056e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,9 +9,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
-"PO-Revision-Date: 2000-06-04 15:40+02:00\n"
+"Project-Id-Version: gnupg 1.0.1h\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
+"PO-Revision-Date: 2000-06-28 18:41+02:00\n"
"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -262,7 +262,7 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "vous avez trouv� un bug... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossible d'ouvrir `%s': %s\n"
@@ -670,8 +670,8 @@ msgstr ""
#: g10/g10.c:403
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
-"Rapporter toutes anomalies � <[email protected]>,\n"
-"et les probl�mes de traduction � <[email protected]>\n"
+"Signaler toutes anomalies � <[email protected]> (en anglais)\n"
+"et tout probl�me de traduction � <[email protected]>.\n"
#: g10/g10.c:407
msgid "Usage: gpg [options] [files] (-h for help)"
@@ -985,7 +985,6 @@ msgid "No reason specified"
msgstr "Aucune raison sp�cifi�e"
#: g10/pkclist.c:118
-#, fuzzy
msgid "Key is superseeded"
msgstr "La cl� a �t� remplac�e"
@@ -998,7 +997,6 @@ msgid "Key is no longer used"
msgstr "La cl� n'est plus utilis�e"
#: g10/pkclist.c:124
-#, fuzzy
msgid "User ID is no longer valid"
msgstr "Le nom d'utilisateur n'est plus valide"
@@ -1273,53 +1271,58 @@ msgstr "�criture de l'auto-signature\n"
msgid "writing key binding signature\n"
msgstr "�criture de la signature de liaison\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Taille invalide; utilisation de %u bits\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie � %u bits\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "S�lectionnez le type de cl� d�sir�:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA et ElGamal (par d�faut)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (signature seule)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (chiffrement seul)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (signature et chiffrement)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) RSA (signature et chiffrement)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Votre choix ? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Voulez-vous vraiment cr�er une cl� de signature et de chiffrement ? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Choix invalide.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1332,18 +1335,22 @@ msgstr ""
" la taille par d�faut est 1024 bits\n"
" la taille maximale conseill�e est 2048 bits\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
+#: g10/keygen.c:610
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1352,12 +1359,12 @@ msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1365,11 +1372,11 @@ msgstr ""
"Les tailles sup�rieures � 2048 ne sont pas conseill�es car\n"
"les calculs prennent VRAIMENT beaucoup de temps !\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "Etes-vous s�r de vouloir cette taille ? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1377,21 +1384,21 @@ msgstr ""
"D'accord, mais n'oubliez pas que les radiations de votre �cran et de votre\n"
"clavier sont aussi tr�s vuln�rables aux attaques !\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Avez-vous r�ellement besoin d'une taille aussi grande ? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La taille demand�e est %u bits\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie � %u bits\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1407,25 +1414,25 @@ msgstr ""
" <n>m = la cl� expire dans n mois\n"
" <n>y = la cl� expire dans n ans\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "La cl� est valide pour ? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "valeur invalide\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "La cl� n'expire pas du tout\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "La cl� expire le %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1433,11 +1440,11 @@ msgstr ""
"Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
"Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "Est-ce correct (o/n) ? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1453,44 +1460,44 @@ msgstr ""
" � Heinrich Heine (Der Dichter) <[email protected]> �\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Nom r�el: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Caract�re invalide dans le nom\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "Le nom doit faire au moins 5 caract�res de long\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Adresse e-mail: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse e-mail valide\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Commentaire: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Caract�re invalide dans le commentaire\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1501,28 +1508,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
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 r�el ou dans le commentaire\n"
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
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:787
+#: g10/keygen.c:883
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:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr "Corrigez l'erreur d'abord\n"
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1530,11 +1537,11 @@ msgstr ""
"Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "le mot de passe n'a pas �t� r�p�t� � l'identique; recommencez.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1546,7 +1553,7 @@ msgstr ""
"le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1558,29 +1565,29 @@ msgstr ""
"pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
"nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "La paire de cl�s DSA fera 1024 bits.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "La g�n�ration de cl� a �t� annul�e.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, c-format
msgid "writing public key to `%s'\n"
msgstr "�criture de la cl� publique vers `%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "�criture de la cl� secr�te vers `%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1589,13 +1596,13 @@ msgstr ""
"utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
"cette fin.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La g�n�ration de cl� a �chou�: %s\n"
# on s'amuse comme on peut...
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1603,7 +1610,7 @@ msgstr ""
"la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
"probl�me d'horloge)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1611,7 +1618,7 @@ msgstr ""
"la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
"probl�me d'horloge\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Cr�er vraiment ? "
@@ -1693,9 +1700,8 @@ msgstr ""
"principale %08lX\n"
#: g10/getkey.c:2017
-#, fuzzy
msgid "[User id not found]"
-msgstr "%s: utilisateur non trouv�\n"
+msgstr "[Nom utilisateur introuvable]"
#: g10/import.c:181
#, c-format
@@ -3667,7 +3673,6 @@ msgstr ""
"fichier par d�faut (indiqu� entre crochets) sera utilis�."
#: g10/helptext.c:229
-#, fuzzy
msgid ""
"You should specify a reason for the certification. Depending on the\n"
"context you have the ability to choose from this list:\n"
diff --git a/po/id.po b/po/id.po
index 4527ef6c4..1321f38f8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 2000-02-06 18:04+07:00\n"
"Last-Translator: Tedi Heriyanto <[email protected]>\n"
"Language-Team: Indonesia <[email protected]>\n"
@@ -256,7 +256,7 @@ msgstr "... kesalahan (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "anda menemukan kesalahan ...(%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@ -1244,53 +1244,58 @@ msgstr "menulis self signature\n"
msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Keysize yang diminta adalah %u bit\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (hanya menandai)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (tandai dan enkripsi)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (tandai dan enkripsi)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Pilihan anda? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Anda ingin membuat kunci sign dan enkripsi? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Pilihan tidak valid.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1303,18 +1308,23 @@ msgstr ""
" keysize default adalah 1024 bit\n"
" keysize tertinggi dianjurkan 2048 bit\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Keysize yang anda inginkan? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1323,12 +1333,12 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1336,11 +1346,11 @@ msgstr ""
"Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
"komputasi akan sangat lama!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "Apakah anda yakin memerlukan keysize ini? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1348,21 +1358,21 @@ msgstr ""
"Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
"diserang!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Keysize yang diminta adalah %u bit\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1378,35 +1388,35 @@ msgstr ""
" <n>m = kunci berakhir dalam n bulan\n"
" <n>y = kunci berakhir dalam n tahun\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "Kunci valid untuk? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "nilai yang tidak valid\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "Kunci tidak pernah berakhir\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "Kunci berakhir pada %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "Benar (y/t)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1421,44 +1431,44 @@ msgstr ""
"user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Nama sebenarnya: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Alamat email: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Komentar: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1468,28 +1478,28 @@ msgstr ""
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
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:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1497,11 +1507,11 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1513,7 +1523,7 @@ msgstr ""
"saat,\n"
"menggunakan program ini dengan pilihan \"--edit-key\".\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1525,29 +1535,29 @@ msgstr ""
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Keypair DSA akan memiliki 1024 bit.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "menulis sertifikat publik ke `%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "menulis sertifikat rahasia ke `%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1556,26 +1566,26 @@ msgstr ""
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, 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:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, 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:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Ingin diciptakan? "
diff --git a/po/it.po b/po/it.po
index 9732b984a..e32b2f61e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 1999-12-08 15:51+02:00\n"
"Last-Translator: Marco d'Itri <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -256,7 +256,7 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Hai trovato un bug... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
@@ -1252,53 +1252,58 @@ msgstr "scrittura della autofirma\n"
msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "La dimensione richiesta della chiave � %u bit\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA e ElGamal (default)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (firma solo)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (cifra solo)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (firma e cifra)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (firma e cifra)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Cosa scegli? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Scelta non valida.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1311,18 +1316,23 @@ msgstr ""
" la dimensione predefinita � 1024 bit\n"
" la dimensione massima consigliata � 2048 bit\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1331,12 +1341,12 @@ msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "la chiave � troppo lunga; %d � il massimo valore permesso.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1344,11 +1354,11 @@ msgstr ""
"Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
"VERAMENTE lunghi!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1356,21 +1366,21 @@ msgstr ""
"Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
"tua tastiera sono molto vulnerabili ad attacchi!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Ti serve davvero una chiave cos� lunga? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La dimensione richiesta della chiave � %u bit\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1386,25 +1396,25 @@ msgstr ""
" <n>m = la chiave scadr� dopo n mesi\n"
" <n>y = la chiave scadr� dopo n anni\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "Chiave valida per? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "valore non valido\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "La chiave non scade\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "La chiave scadr� il %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1412,11 +1422,11 @@ msgstr ""
"Il tuo sistema non pu� mostrare date oltre il 2038.\n"
"Comunque, sar� gestita correttamente fino al 2106.\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "� giusto (s/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1432,44 +1442,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Nome e Cognome: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "Il nome non pu� iniziare con una cifra\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Indirizzo di Email: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non � valido\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Commento: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1480,28 +1490,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
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:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1509,11 +1519,11 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "passphrase non ripetuta correttamente; riprova.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1525,7 +1535,7 @@ msgstr ""
"programma con l'opzione \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1537,29 +1547,29 @@ 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:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "La coppia DSA avr� 1024 bit.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "scrittura del certificato pubblico in `%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "scrittura del certificato segreto in `%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1568,12 +1578,12 @@ msgstr ""
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1581,7 +1591,7 @@ msgstr ""
"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1589,7 +1599,7 @@ msgstr ""
"la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Crea davvero? "
diff --git a/po/ja.po b/po/ja.po
index 7a4469768..7f41b8b5a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 2000-02-16 20:10+09:00\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -257,7 +257,7 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' �������ޤ���: %s\n"
@@ -1241,53 +1241,58 @@ msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
msgid "writing key binding signature\n"
msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�׵ᤵ�줿���������� %u �ӥå�\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "%u �ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "���μ�������򤷤Ʋ�����:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA �� ElGamal (�ǥե����)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (��̾�Τ�)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (�Ź沽�Τ�)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (��̾�ȰŹ沽)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (��̾�ȰŹ沽)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "�ɤ�����Ӥޤ���? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "�����˽�̾�ȰŹ��Ѥθ�����ޤ���? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "̵��������Ǥ���\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1300,18 +1305,23 @@ msgstr ""
" �ǥե���Ȥθ��������� 1024 �ӥå�\n"
" ����θ��������� 2048 �ӥå�\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "�ɤθ������������򤷤ޤ���? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA �θ��������� 512 ���� 1024 �ޤǤǤ�\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1320,12 +1330,12 @@ msgstr "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "�����������礭�����ޤ�; %d ������Ǥ���\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1333,11 +1343,11 @@ msgstr ""
"2048 �ʾ�θ��������ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
"�侩���ޤ���!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "���θ����������������ɤ��Ǥ���? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1345,21 +1355,21 @@ msgstr ""
"�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�������Ф��� "
"�������餱�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ʋ�����!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "���ʤ��������ˤ��Τ褦��Ĺ������ɬ�פǤ���? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�׵ᤵ�줿���������� %u �ӥå�\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u �ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1375,25 +1385,25 @@ msgstr ""
" <n>m = ͭ������ n ��\n"
" <n>y = ͭ������ n ǯ\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "����ͭ������? (0)"
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "̵������\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "����̵���¤Ǥ�\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "���� %s �ˤƴ����ڤ�ˤʤ�ޤ�\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1401,11 +1411,11 @@ msgstr ""
"���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
"2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "������ɤ��Ǥ��� (y/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1421,44 +1431,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "��̾: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "̾����̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "̾���Ͽ����ǻϤޤäƤϤ����ޤ���\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "̾���� 5 ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "�Żҥ᡼�륢�ɥ쥹: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "ͭ�����Żҥ᡼�륢�ɥ쥹�ǤϤ���ޤ���\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "����: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "�����̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "���ʤ���ʸ�������� `%s' ��ȤäƤ��ޤ���\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1469,28 +1479,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-#: g10/keygen.c:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1498,11 +1508,11 @@ msgstr ""
"��̩�����ݸ�뤿��˥ѥ��ե졼����ɬ�פǤ���\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ʋ�������\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1514,7 +1524,7 @@ msgstr ""
"���ץ����ˤ�äơ����ĤǤ��ѹ��Ǥ��ޤ���\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1525,29 +1535,29 @@ msgstr ""
"�ǥ������˥�����������ʤɤ�¾�ι�ư��Ʊ���˹Ԥ��ȡ�����������֤ˤ�\n"
"�𻨤����礭���ɤ�������������䤹���ʤ�ޤ��Τǡ������ᤷ�ޤ���\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA ���ڥ��� 1024 �ӥåȤˤʤ�ޤ�\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "������������ߤ���ޤ�����\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "`%s' �ؤθ����������񤭹��ߤޤ�\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "`%s' �ؤ���̩�������񤭹��ߤޤ�\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "����������̩�����������졢��̾����ޤ�����\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1555,24 +1565,24 @@ msgstr ""
"���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
"\"--edit-key\" ���ޥ�ɤ��Ѥ���������������Ƥ���������\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "���κ����˼���: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "���� %lu ��̤��˺�������ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "���� %lu ��̤��˺�������ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "�����˺������ޤ���? "
diff --git a/po/nl.po b/po/nl.po
index 45cc79087..ab282aca7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 2000-02-20 21:30+01:00\n"
"Last-Translator: Ivo Timmermans <[email protected]>\n"
"Language-Team: Dutch <[email protected]>\n"
@@ -255,7 +255,7 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan `%s' niet openen: %s\n"
@@ -1262,53 +1262,58 @@ msgstr "zelfondertekening wegschrijven\n"
msgid "writing key binding signature\n"
msgstr "schrijven van sleutelbindingsondertekening\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Gevraagde sleutellengte is %u bits\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "afgerond naar %u bits\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Selecteer aub wat voor sleutel u wilt:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA en ElGamal (standaard)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (alleen ondertekenen)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (alleen versleutelen)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (ondertekenen en versleutelen)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (ondertekenen en versleutelen)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Uw keuze? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Wilt u echt een sleutel maken om mee te ondertekenen en versleutelen? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Ongeldige keuze.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1321,18 +1326,23 @@ msgstr ""
" standaard sleutellengte is 1024 bits\n"
" hoogste aan te raden sleutellengte is 2048 bits\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Hoe lang wil je de sleutel maken? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1341,12 +1351,12 @@ msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "sleutel te lang; %d is de maximumlengte.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1354,11 +1364,11 @@ msgstr ""
"Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
"lang duren!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1366,21 +1376,21 @@ msgstr ""
"Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
"erg vatbaar zijn voor aanvallen!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Heb je echt een sleutel nodig die zo lang is? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Gevraagde sleutellengte is %u bits\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "afgerond naar %u bits\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1396,26 +1406,26 @@ msgstr ""
" <n>m = sleutel verloopt over n maanden\n"
" <n>y = sleutel verloopt over n jaar\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "Sleutel is geldig gedurende? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "ongeldige waarde\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "Sleutel verloopt nooit\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "Sleutel verloopt op %s\n"
# fixme
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1423,11 +1433,11 @@ msgstr ""
"Uw systeem kan geen data weergeven van na 2038.\n"
"Desondanks wordt het goed behandeld tot 2106.\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "Klopt dit (j/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1443,44 +1453,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Echte naam: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Ongeldig teken in naam\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "Naam mag niet beginnen met een cijfer\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "Naam moet ten minste 5 tekens lang zijn\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Email Adres: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Ongeldig email adres\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Ongeldig teken in kommentaar\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Je gebruik tekenverzameling `%s'.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1491,28 +1501,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoEe"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
-#: g10/keygen.c:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1520,11 +1530,11 @@ msgstr ""
"Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1536,7 +1546,7 @@ msgstr ""
"nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1549,29 +1559,29 @@ msgstr ""
"dit geeft de generator een grotere kans om genoeg entropie te\n"
"verzamelen.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Sleutelgeneratie afgebroken.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1580,12 +1590,12 @@ msgstr ""
"U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
"sleutel te maken hiervoor.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Sleutelgeneratie is mislukt: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1593,7 +1603,7 @@ msgstr ""
"Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
"klokprobleem)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1601,7 +1611,7 @@ msgstr ""
"sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
"klokprobleem)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Echt maken? "
diff --git a/po/pl.po b/po/pl.po
index 543311e3a..55b23c227 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.0\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 1999-10-02 21:35+02:00\n"
"Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
@@ -266,7 +266,7 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nie mo�na otworzy� %s: %s\n"
@@ -1266,53 +1266,58 @@ msgstr "zapis podpisu klucza nim samym\n"
msgid "writing key binding signature\n"
msgstr "zapis podpisu wi���cego klucz\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "��dana d�ugo�� klucza to %u bity.\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "zaokr�glono do %u bit�w\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Prosz� wybra� rodzaj klucza:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (tylko do podpisywania)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Tw�j wyb�r? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Czy na pewno chcesz stworzy� klucz do szyfrowania i podpisywania? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Niew�a�ciwy wyb�r.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1325,18 +1330,23 @@ msgstr ""
" domy�lny rozmiar klucza wynosi 1024 bity\n"
" najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "Klucz dla DSA musi mie� d�ugo�� pomi�dzy 512 i 1024 bitow.\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1345,12 +1355,12 @@ msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "zbyt du�y rozmiar klucza, ograniczenie wynosi %d.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1358,11 +1368,11 @@ msgstr ""
"Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� obliczenia\n"
"trwaj� wtedy BARDZO d�ugo!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1370,21 +1380,21 @@ msgstr ""
"Nale�y tak�e pami�ta� o tym, �e informacje mog� by� te� wykradzione z\n"
"komputera przez pods�uch emisji elektromagnetycznej klawiatury i monitora!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "��dana d�ugo�� klucza to %u bity.\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokr�glono do %u bit�w\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1400,35 +1410,35 @@ msgstr ""
" <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
" <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "Okres wa�no�ci klucza ? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "niepoprawna warto��\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "Klucz nie ma daty wa�no�ci (nie traci wa�no�ci z up�ywem czasu).\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "Data wa�no�ci klucza: %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "Dane poprawne (t/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1444,44 +1454,44 @@ msgstr ""
" \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Imi� i nazwisko: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "to nie jest poprawny adres poczty elektronicznej\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Komentarz: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Niew�a�ciwy znak w komentarzu\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "U�ywasz zestawu znak�w %s.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1492,46 +1502,46 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr ""
"Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
"przej�� (D)alej czy (W)yj�� z programu? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
"przej�� (D)alej czy (W)yj�� z programu? "
-#: g10/keygen.c:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
"Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�j klucz tajny.\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr ""
"Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej "
"pr�bie;\n"
"spr�buj jeszcze raz.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1543,7 +1553,7 @@ msgstr ""
"i opcji \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1557,29 +1567,29 @@ msgstr ""
"generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci entropii. "
"\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zosta�a anulowana.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "zapis certyfikatu publicznego w '%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapis certyfikatu prywatnego w '%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "prywatny i publiczny klucz zosta� stworzony i podpisany.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1587,12 +1597,12 @@ msgstr ""
"Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\" \n"
"mo�na doda� do niego podklucz u�ywany do szyfrowania.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiod�a si�: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1600,7 +1610,7 @@ msgstr ""
"klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1608,7 +1618,7 @@ msgstr ""
"klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Na pewno generowa�? "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0031e3e90..aa3979a49 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <[email protected]>\n"
@@ -261,7 +261,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "voc� encontrou um bug ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -1279,53 +1279,58 @@ msgstr "escrevendo auto-assinatura\n"
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido � %u bits\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA e ElGamal (padr�o)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (assinatura e criptografia)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (assinatura e criptografia)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Sua op��o? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Voc� realmente quer criar uma chave para assinatura e criptografia? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Op��o inv�lida.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1338,18 +1343,23 @@ msgstr ""
" tamanho padr�o � 1024 bits\n"
" tamanho m�ximo sugerido � 2048 bits\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Que tamanho de chave voc� quer? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1358,12 +1368,12 @@ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1371,11 +1381,11 @@ msgstr ""
"Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
"porque o tempo de computa��o � REALMENTE longo!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1383,21 +1393,21 @@ msgstr ""
"Tudo bem, mas tenha em mente que a radia��o de seu monitor e teclado tamb�m "
"� vulner�vel a ataques!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Voc� realmente precisa de uma chave t�o grande? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido � %u bits\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1413,25 +1423,25 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "A chave � valida por? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "valor inv�lido\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "A chave n�o expira nunca\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "A chave expira em %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1439,11 +1449,11 @@ msgstr ""
"Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
"Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "Est� correto (s/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1459,44 +1469,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Caractere inv�lido no nome\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "O nome n�o pode come�ar com um d�gito\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Endere�o de correio eletr�nico: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Endere�o eletr�nico inv�lido\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Coment�rio: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Caractere inv�lido no coment�rio\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1507,28 +1517,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
-#: g10/keygen.c:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1536,11 +1546,11 @@ msgstr ""
"Voc� precisa de uma frase secreta para proteger sua chave.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1552,7 +1562,7 @@ msgstr ""
"qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1564,29 +1574,29 @@ msgstr ""
"gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
"uma chance melhor de conseguir entropia suficiente.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA ter� 1024 bits.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Gera��o de chave cancelada.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado p�blico para `%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "chaves p�blica e privada criadas e assinadas.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1594,12 +1604,12 @@ msgstr ""
"Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1607,7 +1617,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1615,7 +1625,7 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Realmente criar? "
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 19b2c0ca6..6ce07659d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 1999-09-09 20:28+0000\n"
"Last-Translator: Pedro Morais <[email protected]>\n"
"Language-Team: pt\n"
@@ -258,7 +258,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "voc� encontrou um bug ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -1272,53 +1272,58 @@ msgstr "escrevendo auto-assinatura\n"
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido � %u bits\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA e ElGamal (por omiss�o)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas encrip��o)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (assinatura e encripta��o)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (assinatura e encripta��o)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Op��o? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Voc� quer realmente criar uma chave para assinatura e criptografia? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Op��o inv�lida.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1331,18 +1336,23 @@ msgstr ""
" tamanho por omiss�o � 1024 bits\n"
" tamanho m�ximo sugerido � 2048 bits\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Qual o tamanho de chave desejado? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1351,12 +1361,12 @@ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1364,11 +1374,11 @@ msgstr ""
"Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
"porque o tempo de computa��o � REALMENTE longo!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1376,21 +1386,21 @@ msgstr ""
"Tudo bem, mas n�o se esque�a que a radia��o do seu monitor e teclado tamb�m "
"� extremamente vulner�vel a ataques!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Voc� precisa realmente de uma chave t�o grande? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido � %u bits\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1406,25 +1416,25 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "A chave � valida por? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "valor inv�lido\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "A chave n�o expira nunca\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "A chave expira em %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1432,11 +1442,11 @@ msgstr ""
"O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
"No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "Est� correto (s/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1453,44 +1463,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Caracter inv�lido no nome\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "O nome n�o pode come�ar com um d�gito\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Endere�o de correio eletr�nico: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Endere�o eletr�nico inv�lido\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Coment�rio: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Caracter inv�lido no coment�rio\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1501,28 +1511,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
-#: g10/keygen.c:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1530,11 +1540,11 @@ msgstr ""
"Voc� precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1546,7 +1556,7 @@ msgstr ""
"qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1558,29 +1568,29 @@ msgstr ""
"gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
"uma hip�tese maior de ganhar entropia suficiente.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA ter� 1024 bits.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Gera��o de chave cancelada.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado p�blico para `%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "chaves p�blica e privada criadas e assinadas.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1588,12 +1598,12 @@ msgstr ""
"Note que esta chave n�o pode ser usada para encripta��o. Voc� pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1601,7 +1611,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1609,7 +1619,7 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Realmente criar? "
diff --git a/po/ru.po b/po/ru.po
index bc9945087..865bab080 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
# QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <[email protected]>\n"
@@ -313,7 +313,7 @@ msgstr "��-�� ... ������ � ��������� (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "�� ����� ������ � ��������� ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, fuzzy, c-format
msgid "can't open `%s': %s\n"
msgstr "���������� ������� ���� `%s': %s\n"
@@ -1333,54 +1333,59 @@ msgstr "������� ����-�������\n"
msgid "writing key binding signature\n"
msgstr "������� \"key-binding\" �������\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "����������� ���� ����� ����� %u ���\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "��������� �� %u ���\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "�������� �������� ��� �����:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA � ElGamal (�� ���������)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (������ �������)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (������ ����������)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (������� � ����������)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (������� � ����������)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "��� �����? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
#, fuzzy
msgid "Do you really want to create a sign and encrypt key? "
msgstr "�� ������������� ������ ������� ��������� �����? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "������������ �����.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1393,18 +1398,23 @@ msgstr ""
" ����� ����� �� ���������: 1024 ����\n"
" ������������ ������������� ����� �����: 2048 ���\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "������ ������� ���� �� �������? (1024)"
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "���������� ������ DSA ������ - �� 512 �� 1024 ���\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1413,12 +1423,12 @@ msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, fuzzy, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
#, fuzzy
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
@@ -1427,11 +1437,11 @@ msgstr ""
"����� ������ ������ 2048 �� �������������, ������ ��� ������������������ "
"����� ����� �������!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "�� ������������� ������ ���� ����� �����? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1439,21 +1449,21 @@ msgstr ""
"��, ������ �� ���������, ��� ��������� ����� ���������� � �������� ����\n"
"������ ��� �������� ��� ����.\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "��� ������������� ����� ����� ������� ����? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "����������� ���� ����� ����� %u ���\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "��������� �� %u ���\n"
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1469,35 +1479,35 @@ msgstr ""
" <n>m = ���� �������� ����� n �������\n"
" <n>y = ���� �������� ����� n ���\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "���� ������������ � �������? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "������������ ��������.\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "���������� ����.\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "���� ��������� �� %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "��� �����? (y/n) "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1513,44 +1523,44 @@ msgstr ""
" \"Vasya Pupkin (KRUTOI) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "���� ��� (\"��� �������\"): "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "������������ ������ � �����\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "������ ��� �� ����� ���������� � �����.\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "������ ��� ������ �������� �� ����� ��� �� 5�� ��������.\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "E-Mail: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "������������ E-Mail\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "�����������: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "������������ ������ � �����������.\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr ""
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1561,29 +1571,29 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "��������: N=���, C=�����������, E=E-Mail, O=Okay/Q=�����? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "��������: N=���, C=�����������, E=E-Mail, O=Okay/Q=�����? "
-#: g10/keygen.c:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1591,11 +1601,11 @@ msgstr ""
"��� ������ ������ ����� ����� �������� �����.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "�������� ����� �� ���� ��������������, ���������� �����.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1607,7 +1617,7 @@ msgstr ""
"�����, �������� ��� ��������� � ���������� \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
#, fuzzy
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1620,30 +1630,30 @@ msgstr ""
"��������� ������� ��� �������� ����������). ��� ���� ���������� ���������\n"
"����� ����������� ������� ���������� ��������.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "�������� ���� DSA ����� ����� ����� 1024 ����.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
#, fuzzy
msgid "Key generation canceled.\n"
msgstr "��������� ����� ��������: %s\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "�������� ���������� ������������ � `%s'\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "��������� ���������� ������������ � `%s'\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "�������� � ��������� ����� ������� � ���������.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -1654,12 +1664,12 @@ msgstr ""
"���������������\n"
"����� ��� ����������.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "��������� ����� �� �������: %s\n"
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, fuzzy, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1667,7 +1677,7 @@ msgstr ""
"�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
"����������� ����)\n"
-#: g10/keygen.c:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, fuzzy, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1675,7 +1685,7 @@ msgstr ""
"�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
"����������� ����)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
#, fuzzy
msgid "Really create? "
msgstr "������������� �������? "
diff --git a/po/sv.po b/po/sv.po
index 0e9745b53..b926d5e0f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-06-27 12:16+0200\n"
+"POT-Creation-Date: 2000-06-28 11:50+0200\n"
"PO-Revision-Date: 2000-02-16 08:19+01:00\n"
"Last-Translator: Daniel Resare <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
@@ -268,7 +268,7 @@ msgstr "... detta �r en bugg (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1150
+#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan inte �ppna \"%s\": %s\n"
@@ -1278,53 +1278,58 @@ msgstr "skriver sj�lvsignatur\n"
msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
-#: g10/keygen.c:261 g10/keygen.c:345
+#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Den efterfr�gade nyckelstorleken �r %u bitar\n"
-#: g10/keygen.c:266 g10/keygen.c:350
+#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avrundade upp�t till %u bitar\n"
-#: g10/keygen.c:456
+#: g10/keygen.c:537
msgid "Please select what kind of key you want:\n"
msgstr "V�lj vilken typ av nyckel du vill ha:\n"
-#: g10/keygen.c:458
+#: g10/keygen.c:539
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA och ElGamal (standardvalet)\n"
-#: g10/keygen.c:459
+#: g10/keygen.c:540
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (endast signering)\n"
-#: g10/keygen.c:461
+#: g10/keygen.c:542
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (endast kryptering)\n"
-#: g10/keygen.c:462
+#: g10/keygen.c:543
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (signering och kryptering)\n"
-#: g10/keygen.c:465
+#: g10/keygen.c:545
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (signering och kryptering)\n"
+
+#: g10/keygen.c:549
msgid "Your selection? "
msgstr "Vad v�ljer du? "
-#: g10/keygen.c:475
+#: g10/keygen.c:560 g10/keygen.c:568
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Vill du verkligen skapa en nyckel f�r signering och kryptering? "
-#: g10/keygen.c:489
+#: g10/keygen.c:582
msgid "Invalid selection.\n"
msgstr "Felaktigt val.\n"
-#: g10/keygen.c:501
+#: g10/keygen.c:594
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1337,18 +1342,23 @@ msgstr ""
" den f�rvalda nyckelstorleken �r 1024 bitar\n"
" den st�rsta f�reslagna nyckelstorleken �r 2048 bitar\n"
-#: g10/keygen.c:508
+#: g10/keygen.c:601
msgid "What keysize do you want? (1024) "
msgstr "Vilken nyckelstorlek vill du ha? (1024) "
-#: g10/keygen.c:513
+#: g10/keygen.c:606
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA till�ter bara nyckelstorlekar fr�n 512 till 1024\n"
-#: g10/keygen.c:515
+#: g10/keygen.c:608
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "nyckelstorleken �r f�r liten; 768 �r det minst till�tna v�rdet.\n"
+#: g10/keygen.c:610
+#, fuzzy
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "nyckelstorleken �r f�r liten; 768 �r det minst till�tna v�rdet.\n"
+
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
#. * to create such a key (but less than the time the Sirius
@@ -1357,12 +1367,12 @@ msgstr "nyckelstorleken �r f�r liten; 768 �r det minst till�tna v�rdet.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:525
+#: g10/keygen.c:621
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "nyckelstorleken �r f�r stor; %d �r det st�rsta till�tna v�rdet\n"
-#: g10/keygen.c:530
+#: g10/keygen.c:626
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1370,11 +1380,11 @@ msgstr ""
"Nyckelstorlekar st�rre �n 2048 �r inte att rekommendera\n"
"eftersom ber�kningar tar MYCKET l�ng tid!\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:629
msgid "Are you sure that you want this keysize? "
msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
-#: g10/keygen.c:534
+#: g10/keygen.c:630
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1382,22 +1392,22 @@ msgstr ""
"Ok, men kom ih�g att din bildsk�rm och ditt tangentbord ocks� s�nder\n"
"avsl�jande str�lning som kan avlyssnas!\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:638
msgid "Do you really need such a large keysize? "
msgstr "Beh�ver du verkligen en s� stor nyckelstorlek? "
-#: g10/keygen.c:548
+#: g10/keygen.c:644
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Den efterfr�gade nyckelstorleken �r %u bitar\n"
-#: g10/keygen.c:551 g10/keygen.c:555
+#: g10/keygen.c:647 g10/keygen.c:651
#, c-format
msgid "rounded up to %u bits\n"
msgstr "avrundade upp�t till %u bitar\n"
# borde kolla upp m�jligheterna i k�llkoden att anv�nda v m � ist�llet f�r wmy
-#: g10/keygen.c:603
+#: g10/keygen.c:699
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1413,25 +1423,25 @@ msgstr ""
" <n>m = nyckeln blir ogiltig efter n m�nader\n"
" <n>y = nyckeln blir ogiltig efter n �r\n"
-#: g10/keygen.c:618
+#: g10/keygen.c:714
msgid "Key is valid for? (0) "
msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
-#: g10/keygen.c:623
+#: g10/keygen.c:719
msgid "invalid value\n"
msgstr "ogiltigt v�rde\n"
-#: g10/keygen.c:628
+#: g10/keygen.c:724
msgid "Key does not expire at all\n"
msgstr "Nyckeln g�r aldrig ut\n"
#. print the date when the key expires
-#: g10/keygen.c:634
+#: g10/keygen.c:730
#, c-format
msgid "Key expires at %s\n"
msgstr "Nyckeln g�r ut vid f�ljande tidpunkt: %s\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:733
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1439,11 +1449,11 @@ msgstr ""
"Ditt system kan inte visa datum senare �n �r 2038.\n"
"Datum fram till �r 2106 kommer dock att hanteras korrekt.\n"
-#: g10/keygen.c:642
+#: g10/keygen.c:738
msgid "Is this correct (y/n)? "
msgstr "St�mmer detta (j/n)? "
-#: g10/keygen.c:685
+#: g10/keygen.c:781
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1459,44 +1469,44 @@ msgstr ""
" \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:697
+#: g10/keygen.c:793
msgid "Real name: "
msgstr "Namn: "
-#: g10/keygen.c:701
+#: g10/keygen.c:797
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
-#: g10/keygen.c:703
+#: g10/keygen.c:799
msgid "Name may not start with a digit\n"
msgstr "Namnet f�r inte b�rja med en siffra\n"
-#: g10/keygen.c:705
+#: g10/keygen.c:801
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet m�ste vara �tminstone 5 tecken l�ngt\n"
-#: g10/keygen.c:713
+#: g10/keygen.c:809
msgid "Email address: "
msgstr "Epostadress: "
-#: g10/keygen.c:724
+#: g10/keygen.c:820
msgid "Not a valid email address\n"
msgstr "Epostadressen �r ogiltig\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:828
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:738
+#: g10/keygen.c:834
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
-#: g10/keygen.c:761
+#: g10/keygen.c:857
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du anv�nder teckenupps�ttningen \"%s\"\n"
-#: g10/keygen.c:767
+#: g10/keygen.c:863
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1507,29 +1517,29 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:771
+#: g10/keygen.c:867
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:776
+#: g10/keygen.c:872
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
-#: g10/keygen.c:786
+#: g10/keygen.c:882
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�ndra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
-#: g10/keygen.c:787
+#: g10/keygen.c:883
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:806
+#: g10/keygen.c:902
msgid "Please correct the error first\n"
msgstr ""
# fel kapitalisering i originalet?
-#: g10/keygen.c:844
+#: g10/keygen.c:940
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1537,11 +1547,11 @@ msgstr ""
"Du beh�ver en l�senordsfras f�r att skydda din hemliga nyckel\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:852
+#: g10/keyedit.c:468 g10/keygen.c:948
msgid "passphrase not correctly repeated; try again.\n"
msgstr "l�senordsfrasen upprepades ej korrekt; f�rs�k igen.\n"
-#: g10/keygen.c:858
+#: g10/keygen.c:954
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"
@@ -1552,7 +1562,7 @@ msgstr ""
"Jag kommer att g�ra det �nd�. Du kan �ndra din l�senordsfras n�rsomhelst\n"
"om du anv�nder detta program med flaggan \"--edit-key\".\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:975
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"
@@ -1564,29 +1574,29 @@ msgstr ""
"h�rddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en st�rre chans att samla ihop en tillr�cklig m�ngd entropi.\n"
-#: g10/keygen.c:1325
+#: g10/keygen.c:1424
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
-#: g10/keygen.c:1368
+#: g10/keygen.c:1467
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbr�ts.\n"
-#: g10/keygen.c:1465
+#: g10/keygen.c:1564
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "Skriver publikt certifikat till \"%s\"\n"
-#: g10/keygen.c:1466
+#: g10/keygen.c:1565
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemligt certifikat till \"%s\"\n"
-#: g10/keygen.c:1562
+#: g10/keygen.c:1661
msgid "public and secret key created and signed.\n"
msgstr "publik och hemlig nyckel skapad och signerad.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1666
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1595,13 +1605,13 @@ msgstr ""
"att vilja anv�nda kommandot \"--edit-key\" f�r att generera en sekund�r\n"
"nyckel f�r detta syfte.\n"
-#: g10/keygen.c:1584 g10/keygen.c:1685
+#: g10/keygen.c:1683 g10/keygen.c:1784
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
# c-format beh�vs inte i singularis
-#: g10/keygen.c:1628 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1609,7 +1619,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:1630 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1617,7 +1627,7 @@ msgstr ""
"nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
"relaterat till tidsresande eller en felst�lld klocka)\n"
-#: g10/keygen.c:1663
+#: g10/keygen.c:1762
msgid "Really create? "
msgstr "Vill du verkligen skapa? "
diff --git a/tools/ChangeLog b/tools/ChangeLog
index e936bfcd9..dbd879b43 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 5 13:28:45 CEST 2000 Werner Koch <wk@>
+
+ * mail-signed-keys: New.
+
Tue May 23 09:19:00 CEST 2000 Werner Koch <[email protected]>
* ring-a-party: New.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b4050abf9..422a715a8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = lspgpot
+EXTRA_DIST = lspgpot ring-a-party mail-signed-keys
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
needed_libs = ../cipher/libcipher.a \
../mpi/libmpi.a ../util/libutil.a @INTLLIBS@
diff --git a/tools/mail-signed-keys b/tools/mail-signed-keys
new file mode 100755
index 000000000..3f9f01831
--- /dev/null
+++ b/tools/mail-signed-keys
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+if [ -z "$1" -o -z "$2" ]; then
+ echo "usage: mail-signed-keys keyring signedby" >&2
+ exit 1
+fi
+
+if [ ! -f $1 ]; then
+ echo "mail-signed-keys: '$1': no such file" >&2
+ exit 1
+fi
+
+[ -f '.#tdb.tmp' ] && rm '.#tdb.tmp'
+ro="--trustdb-name=./.#tdb.tmp --dry-run --lock-never --no-default-keyring --keyring $1"
+
+signedby=`gpg $ro --fast-list-mode --list-keys --with-colons $2 \
+ 2>/dev/null | awk -F: '$1=="pub" {print $5; exit 0}'`
+
+if [ -z "$signedby" ]; then
+ echo "mail-signed-keys: '$2': no such signator" >&2
+ exit 1
+fi
+
+echo "About to send the the keys signed by $signedby" >&2
+echo -n "to their owners. Do you really want to do this? (y/N)" >&2
+read
+[ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0
+
+
+gpg $ro --check-sigs --with-colons 2>/dev/null \
+ | awk -F: -v signedby="$signedby" -v gpgopt="$ro" '
+BEGIN { sendmail="/usr/lib/sendmail -oi -t " }
+$1 == "pub" { nextkid=$5; nextuid=$10
+ if( uidcount > 0 ) { myflush() }
+ kid=nextkid; uid=nextuid; next
+ }
+$1 == "uid" { uid=$10 ; next }
+$1 == "sig" && $2 == "!" && $5 == signedby { uids[uidcount++] = uid; next }
+END { if( uidcount > 0 ) { myflush() } }
+
+function myflush()
+{
+ if ( kid == signedby ) { uidcount=0; return }
+ print "sending key " substr(kid,9) " to" | "cat >&2"
+ for(i=0; i < uidcount; i++ ) {
+ print " " uids[i] | "cat >&2"
+ if( i == 0 ) {
+ printf "To: %s", uids[i] | sendmail
+ }
+ else {
+ printf ",\n %s", uids[i] | sendmail
+ }
+ }
+ printf "\n" | sendmail
+ print "Subject: I signed your key " substr(kid,9) | sendmail
+ print "" | sendmail
+ print "Hi," | sendmail
+ print "" | sendmail
+ print "Here you get back the signed key." | sendmail
+ print "" | sendmail
+ print "ciao," | sendmail
+ print " your Key Signator" | sendmail
+ print "" | sendmail
+ cmd = "gpg " gpgopt " --export -a " kid " 2>/dev/null"
+ while( (cmd | getline) > 0 ) {
+ print | sendmail
+ }
+ print "" | sendmail
+ close(cmd)
+ close( sendmail )
+ uidcount=0
+}
+'
+
+
diff --git a/util/argparse.c b/util/argparse.c
index 929d62a79..1fdc8d1bd 100644
--- a/util/argparse.c
+++ b/util/argparse.c
@@ -73,7 +73,7 @@
* Bit 3 : Do not use -- to stop option processing.
* Bit 4 : Do not skip the first arg.
* Bit 5 : allow usage of long option with only one dash
- * Bit 6 : ignore --version
+ * Bit 6 : ignore --version and --help
* all other bits must be set to zero, this value is modified by the
* function, so assume this is write only.
* Local flags (for each option):
@@ -513,8 +513,11 @@ arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
if( argpos )
*argpos = '=';
- if( i < 0 && !strcmp( "help", s+2) )
- show_help(opts, arg->flags);
+ if( i < 0 && !strcmp( "help", s+2) ) {
+ if( !(arg->flags & (1<<6)) ) {
+ show_help(opts, arg->flags);
+ }
+ }
else if( i < 0 && !strcmp( "version", s+2) ) {
if( !(arg->flags & (1<<6)) ) {
show_version();
@@ -600,8 +603,11 @@ arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts)
break;
}
- if( !opts[i].short_opt && ( *s == 'h' || *s == '?' ) )
- show_help(opts, arg->flags);
+ if( !opts[i].short_opt && ( *s == 'h' || *s == '?' ) ) {
+ if( !(arg->flags & (1<<6)) ) {
+ show_help(opts, arg->flags);
+ }
+ }
arg->r_opt = opts[i].short_opt;
if( !opts[i].short_opt ) {