summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--README512
-rw-r--r--acinclude.m410
-rwxr-xr-xchecks/genkey1024.test5
-rwxr-xr-xchecks/signencrypt-dsa.test4
-rwxr-xr-xchecks/sigs-dsa.test5
-rw-r--r--cipher/ChangeLog14
-rw-r--r--cipher/Makefile.am5
-rw-r--r--cipher/dsa.c13
-rw-r--r--cipher/elgamal.c28
-rw-r--r--cipher/primegen.c6
-rw-r--r--cipher/rsa.c40
-rw-r--r--configure.in10
-rw-r--r--doc/Makefile.am13
-rw-r--r--g10/ChangeLog8
-rw-r--r--g10/Makefile.am3
-rw-r--r--g10/keygen.c9
-rw-r--r--mpi/ChangeLog9
-rw-r--r--mpi/Makefile.am9
-rw-r--r--mpi/generic/mpi-asm-defs.h3
-rw-r--r--mpi/mpi-internal.h18
-rw-r--r--mpi/mpicoder.c2
-rw-r--r--mpi/mpiutil.c1
-rw-r--r--po/da.po130
-rw-r--r--po/de.po130
-rw-r--r--po/eo.po130
-rw-r--r--po/es_ES.po130
-rw-r--r--po/fr.po130
-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
37 files changed, 1059 insertions, 1492 deletions
diff --git a/ChangeLog b/ChangeLog
index 9db937e5f..2f85d3700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-13 Werner Koch <wk@gnupg.org>
+
+ * acinclude.m4 (GNUPG_FIX_HDR_VERSION): VPATH build fix.
+
2000-10-10 Werner Koch <wk@gnupg.org>
* Makefile.am (dist-hook): Create the version file.
diff --git a/README b/README
index 9292d3621..b0ef9c669 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-
GnuPG - The GNU Privacy Guard
-------------------------------
Version 1.1
@@ -12,516 +10,12 @@
Branch 1.0.x for real work. The next
stable release will be 1.2
+This version has been released due to the included libgcrypt which is
+used by GNUTLS.
- GnuPG is GNU's tool for secure communication and data storage.
- It can be used to encrypt data and to create digital signatures.
- It includes an advanced key management facility and is compliant
- with the proposed OpenPGP Internet standard as described in RFC2440.
-
- GnuPG works best on GNU/Linux or *BSD systems. Most other Unices
- are also supported but are not as well tested as the Free Unices.
- See http://www.gnupg.org/gnupg.html#supsys for a list of systems
- which are known to work.
-
- See the file COPYING for copyright and warranty information.
-
- Because GnuPG does not use use any patented algorithm it cannot be
- compatible with PGP2 versions. PGP 2.x uses only IDEA (which is
- patented worldwide) and RSA (which is patented in the United States
- until Sep 20, 2000).
-
- The default algorithms are DSA and ElGamal. ElGamal for signing
- is still available, but because of the larger size of such
- signatures it is deprecated (Please note that the GnuPG
- implementation of ElGamal signatures is *not* insecure). Symmetric
- algorithms are: 3DES, Blowfish, CAST5 and Twofish (GnuPG does not
- yet create Twofish encrypted messages because there is no agreement
- in the OpenPGP WG on how to use it together with a MDC algorithm)
- Digest algorithms available are MD5, RIPEMD160 and SHA1.
-
-
- Installation
- ------------
-
- Please read the file INSTALL!
-
- Here is a quick summary:
-
- 1) Check that you have unmodified sources. The below on how to do this.
- Don't skip it - this is an important step!
-
- 2) Unpack the TAR. With GNU tar you can do it this way:
- "tar xzvf gnupg-x.y.z.tar.gz"
-
- 3) "cd gnupg-x.y.z"
-
- 4) "./configure"
-
- 5) "make"
-
- 6) "make install"
-
- 7) You end up with a "gpg" binary in /usr/local/bin.
- Note: Because some old programs rely on the existence of a
- binary named "gpgm" (which was build by some Beta versions
- of GnuPG); you may want to install a symbolic link to it:
- "cd /usr/local/bin; ln -s gpg gpgm"
-
- 8) To avoid swapping out of sensitive data, you can install "gpg" as
- suid root. If you don't do so, you may want to add the option
- "no-secmem-warning" to ~/.gnupg/options
-
-
- How to Verify the Source
- ------------------------
-
- In order to check that the version of GnuPG which you are going to
- install is an original and unmodified one, you can do it in one of
- the following ways:
-
- a) If you already have a trusted Version of GnuPG installed, you
- can simply check the supplied signature:
-
- $ gpg --verify gnupg-x.y.z.tar.gz.asc
-
- This checks that the detached signature gnupg-x.y.z.tar.gz.asc
- is indeed a a signature of gnupg-x.y.z.tar.gz. The key used to
- create this signature is:
-
- "pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) <dd9jn@gnu.org>"
-
- If you do not have this key, you can get it from the source in
- the file g10/pubring.asc (use "gpg --import g10/pubring.gpg" to
- add it to the keyring) or from any keyserver. You have to make
- sure that this is really the key and not a faked one. You can do
- this by comparing the output of:
-
- $ gpg --fingerprint 0x57548DCD
-
- with the elsewhere published fingerprint, or - if you are able to
- _positively_ verify the signature of this README file - with
- this fingerprint: "6BD9 050F D8FC 941B 4341 2DCC 68B7 AB89 5754 8DCD"
-
- Please note, that you have to use an old version of GnuPG to
- do all this stuff. *Never* use the version which you are going
- to check!
-
-
- b) If you have a trusted Version of PGP 2 or 5 installed, you
- can check the supplied PGP 2 signature:
-
- $ pgp gnupg-x.y.z.tar.gz.sig gnupg-x.y.z.tar.gz
-
- This checks that the detached signature gnupg-x.y.z.tar.gz.sig
- is indeed a a signature of gnupg-x.y.z.tar.gz. Please note,
- that this signature has been created with a RSA signature and
- you probably can't use this method (due to legal reasons) when
- you are in the U.S. The key used to create this signature is
- the same as the one used to sign this README file. It should be
- available at the keyservers and is also included in the source
- of GnuPG in g10/pubring.asc.
-
- "pub 768R/0C9857A5 1995-09-30 Werner Koch <werner.koch@guug.de>"
-
- The fingerprint of this key is published in printed form in the
- "Global Trust Register for 1998", ISBN 0-9532397-0-5.
-
-
- c) If you don't have any of the above programs, you have to verify
- the MD5 checksum:
-
- $ md5sum gnupg-x.y.z.tar.gz.sig
-
- This should yield an output similar_to this:
-
- fd9351b26b3189c1d577f0970f9dcadc gnupg-x.y.z.tar.gz
-
- Now check that this checksum is _exactly_ the same as the one
- published via the announcement list and probably via Usenet.
-
-
-
- Documentation
- -------------
-
- A draft version of the manual is included in the subdirectory doc/gph.
- The supplied version is rendered in HTML and you may access it with any
- browser (e.g.: lynx doc/gpg/index.html). The GnuPG webpages have a link
- to the latest development version and you may want to read those instead.
-
- A couple of HOWTO documents are available online; for a listing see:
-
- http://www.gnupg.org/docs.html#howtos
-
- A man page with a description of all commands and options gets installed
- along with the program.
-
-
- Introduction
- ------------
-
- Here is a brief overview on how to use GnuPG - it is strongly suggested
- that you read the manual and other information about the use of
- cryptography. GnuPG is only a tool, secure usage requires that
- YOU KNOW WHAT YOU ARE DOING.
-
- If you already have a DSA key from PGP 5 (they call them DH/ElGamal)
- you can simply copy the pgp keyrings over the GnuPG keyrings after
- running gpg once to create the correct directory.
-
- The normal way to create a key is
-
- gpg --gen-key
-
- This asks some questions and then starts key generation. To create
- good random numbers for the key parameters, GnuPG needs to gather
- enough noise (entropy) from your system. If you see no progress
- during key generation you should start some other activities such
- as mouse moves or hitting on the CTRL and SHIFT keys.
-
- Generate a key ONLY on a machine where you have direct physical
- access - don't do it over the network or on a machine used also
- by others - especially if you have no access to the root account.
-
- When you are asked for a passphrase use a good one which you can
- easy remember. Don't make the passphrase too long because you have
- to type it for every decryption or signing; but, - AND THIS IS VERY
- IMPORTANT - use a good one that is not easily to guess because the
- security of the whole system relies on your secret key and the
- passphrase that protects it when someone gains access to your secret
- keyring. A good way to select a passphrase is to figure out a short
- nonsense sentence which makes some sense for you and modify it by
- inserting extra spaces, non-letters and changing the case of some
- characters - this is really easy to remember especially if you
- associate some pictures with it.
-
- Next, you should create a revocation certificate in case someone
- gets knowledge of your secret key or you forgot your passphrase
-
- gpg --gen-revoke your_user_id
-
- Run this command and store the revocation certificate away. The output
- is always ASCII armored, so that you can print it and (hopefully
- never) re-create it if your electronic media fails.
-
- Now you can use your key to create digital signatures
-
- gpg -s file
-
- This creates a file "file.gpg" which is compressed and has a
- signature attached.
-
- gpg -sa file
-
- Same as above, but creates a file "file.asc" which is ASCII armored
- and and ready for sending by mail. It is better to use your
- mailers features to create signatures (The mailer uses GnuPG to do
- this) because the mailer has the ability to MIME encode such
- signatures - but this is not a security issue.
-
- gpg -s -o out file
-
- Creates a signature of "file", but writes the output to the file
- "out".
-
- Everyone who knows your public key (you can and should publish
- your key by putting it on a key server, a web page or in your .plan
- file) is now able to check whether you really signed this text
-
- gpg --verify file
-
- GnuPG now checks whether the signature is valid and prints an
- appropriate message. If the signature is good, you know at least
- that the person (or machine) has access to the secret key which
- corresponds to the published public key.
-
- If you run gpg without an option it will verify the signature and
- create a new file that is identical to the original. gpg can also
- run as a filter, so that you can pipe data to verify trough it
-
- cat signed-file | gpg | wc -l
-
- which will check the signature of signed-file and then display the
- number of lines in the original file.
-
- To send a message encrypted to someone you can use
-
- gpg -e -r heine file
-
- This encrypts "file" with the public key of the user "heine" and
- writes it to "file.gpg"
-
- echo "hello" | gpg -ea -r heine | mail heine
-
- Ditto, but encrypts "hello\n" and mails it as ASCII armored message
- to the user with the mail address heine.
-
- gpg -se -r heine file
-
- This encrypts "file" with the public key of "heine" and writes it
- to "file.gpg" after signing it with your user id.
-
- gpg -se -r heine -u Suttner file
-
- Ditto, but sign the file with your alternative user id "Suttner"
-
-
- GnuPG has some options to help you publish public keys. This is
- called "exporting" a key, thus
-
- gpg --export >all-my-keys
-
- exports all the keys in the keyring and writes them (in a binary
- format) to "all-my-keys". You may then mail "all-my-keys" as an
- MIME attachment to someone else or put it on an FTP server. To
- export only some user IDs, you give them as arguments on the command
- line.
-
- To mail a public key or put it on a web page you have to create
- the key in ASCII armored format
-
- gpg --export --armor | mail panther@tiger.int
-
- This will send all your public keys to your friend panther.
-
- If you have received a key from someone else you can put it
- into your public keyring. This is called "importing"
-
- gpg --import [filenames]
-
- New keys are appended to your keyring and already existing
- keys are updated. Note that GnuPG does not import keys that
- are not self-signed.
-
- Because anyone can claim that a public key belongs to her
- we must have some way to check that a public key really belongs
- to the owner. This can be achieved by comparing the key during
- a phone call. Sure, it is not very easy to compare a binary file
- by reading the complete hex dump of the file - GnuPG (and nearly
- every other program used for management of cryptographic keys)
- provides other solutions.
-
- gpg --fingerprint <username>
-
- prints the so called "fingerprint" of the given username which
- is a sequence of hex bytes (which you may have noticed in mail
- sigs or on business cards) that uniquely identifies the public
- key - different keys will always have different fingerprints.
- It is easy to compare fingerprints by phone and I suggest
- that you print your fingerprint on the back of your business
- card. To see the fingerprints of the secondary keys, you can
- give the command twice; but this is normally not needed.
-
- If you don't know the owner of the public key you are in trouble.
- Suppose however that friend of yours knows someone who knows someone
- who has met the owner of the public key at some computer conference.
- Suppose that all the people between you and the public key holder
- may now act as introducers to you. Introducers signing keys thereby
- certify that they know the owner of the keys they sign. If you then
- trust all the introducers to have correctly signed other keys, you
- can be be sure that the other key really belongs to the one who
- claims to own it..
-
- There are 2 steps to validate a key:
- 1. First check that there is a complete chain
- of signed keys from the public key you want to use
- and your key and verify each signature.
- 2. Make sure that you have full trust in the certificates
- of all the introduces between the public key holder and
- you.
- Step 2 is the more complicated part because there is no easy way
- for a computer to decide who is trustworthy and who is not. GnuPG
- leaves this decision to you and will ask you for a trust value
- (here also referenced as the owner-trust of a key) for every key
- needed to check the chain of certificates. You may choose from:
- a) "I don't know" - then it is not possible to use any
- of the chains of certificates, in which this key is used
- as an introducer, to validate the target key. Use this if
- you don't know the introducer.
- b) "I do not trust" - Use this if you know that the introducer
- does not do a good job in certifying other keys. The effect
- is the same as with a) but for a) you may later want to
- change the value because you got new information about this
- introducer.
- c) "I trust marginally" - Use this if you assume that the
- introducer knows what he is doing. Together with some
- other marginally trusted keys, GnuPG validates the target
- key then as good.
- d) "I fully trust" - Use this if you really know that this
- introducer does a good job when certifying other keys.
- If all the introducer are of this trust value, GnuPG
- normally needs only one chain of signatures to validate
- a target key okay. (But this may be adjusted with the help
- of some options).
- This information is confidential because it gives your personal
- opinion on the trustworthiness of someone else. Therefore this data
- is not stored in the keyring but in the "trustdb"
- (~/.gnupg/trustdb.gpg). Do not assign a high trust value just
- because the introducer is a friend of yours - decide how well she
- understands the implications of key signatures and you may want to
- tell her more about public key cryptography so you can later change
- the trust value you assigned.
-
- Okay, here is how GnuPG helps you with key management. Most stuff
- is done with the --edit-key command
-
- gpg --edit-key <keyid or username>
-
- GnuPG displays some information about the key and then prompts
- for a command (enter "help" to see a list of commands and see
- the man page for a more detailed explanation). To sign a key
- you select the user ID you want to sign by entering the number
- that is displayed in the leftmost column (or do nothing if the
- key has only one user ID) and then enter the command "sign" and
- follow all the prompts. When you are ready, give the command
- "save" (or use "quit" to cancel your actions).
-
- If you want to sign the key with another of your user IDs, you
- must give an "-u" option on the command line together with the
- "--edit-key".
-
- Normally you want to sign only one user ID because GnuPG
- uses only one and this keeps the public key certificate
- small. Because such key signatures are very important you
- should make sure that the signatories of your key sign a user ID
- which is very likely to stay for a long time - choose one with an
- email address you have full control of or do not enter an email
- address at all. In future GnuPG will have a way to tell which
- user ID is the one with an email address you prefer - because
- you have no signatures on this email address it is easy to change
- this address. Remember, your signatories sign your public key (the
- primary one) together with one of your user IDs - so it is not possible
- to change the user ID later without voiding all the signatures.
-
- Tip: If you hear about a key signing party on a computer conference
- join it because this is a very convenient way to get your key
- certified (But remember that signatures have nothing to to with the
- trust you assign to a key).
-
-
- 8 Ways to Specify a User ID
- --------------------------
- There are several ways to specify a user ID, here are some examples.
-
- * Only by the short keyid (prepend a zero if it begins with A..F):
-
- "234567C4"
- "0F34E556E"
- "01347A56A"
- "0xAB123456
-
- * By a complete keyid:
-
- "234AABBCC34567C4"
- "0F323456784E56EAB"
- "01AB3FED1347A5612"
- "0x234AABBCC34567C4"
-
- * By a fingerprint:
-
- "1234343434343434C434343434343434"
- "123434343434343C3434343434343734349A3434"
- "0E12343434343434343434EAB3484343434343434"
-
- The first one is MD5 the others are ripemd160 or sha1.
-
- * By an exact string:
-
- "=Heinrich Heine <heinrichh@uni-duesseldorf.de>"
-
- * By an email address:
-
- "<heinrichh@uni-duesseldorf.de>"
-
- * By word match
-
- "+Heinrich Heine duesseldorf"
-
- All words must match exactly (not case sensitive) and appear in
- any order in the user ID. Words are any sequences of letters,
- digits, the underscore and characters with bit 7 set.
-
- * By the Local ID (from the trust DB):
-
- "#34"
-
- This may be used by a MUA to specify an exact key after selecting
- a key from GnuPG (by using a special option or an extra utility)
-
- * Or by the usual substring:
-
- "Heine"
- "*Heine"
-
- The '*' indicates substring search explicitly.
-
-
- Batch mode
- ----------
- If you use the option "--batch", GnuPG runs in non-interactive mode and
- never prompts for input data. This does not even allow entering the
- passphrase. Until we have a better solution (something like ssh-agent),
- you can use the option "--passphrase-fd n", which works like PGP's
- PGPPASSFD.
-
- Batch mode also causes GnuPG to terminate as soon as a BAD signature is
- detected.
-
-
- Exit status
- -----------
- GnuPG returns with an exit status of 1 if in batch mode and a bad signature
- has been detected or 2 or higher for all other errors. You should parse
- stderr or, better, the output of the fd specified with --status-fd to get
- detailed information about the errors.
-
-
- How to Get More Information
- ---------------------------
-
- The primary WWW page is "http://www.gnupg.org"
- The primary FTP site is "ftp://ftp.gnupg.org/pub/gcrypt/"
-
- See http://www.gnupg.org/mirrors.html for a list of FTP mirrors
- and use them if possible. You may also find GnuPG mirrored on
- some of the regular GNU mirrors.
-
- We have some mailing lists dedicated to GnuPG:
-
- gnupg-announce@gnupg.org For important announcements like
- new versions and such stuff.
- This is a moderated list and has
- very low traffic.
- gnupg-users@gnupg.org For general user discussion and
- help.
- gnupg-devel@gnupg.org GnuPG developers main forum.
-
- You subscribe to one of the list by sending mail with a subject
- of "subscribe" to x-request@gnupg.org, where x is the name of the
- mailing list (gnupg-announce, gnupg-users, etc.). An archive of
- the mailing lists is available at http://lists.gnupg.org .
-
- The gnupg.org domain is hosted in Germany to avoid possible legal
- problems (technical advices may count as a violation of ITAR).
+GPG itself does not work and will not be installed.
- Please direct bug reports to <gnupg-bugs@gnu.org> or post
- them direct to the mailing list <gnupg-devel@gnupg.org>.
- Please direct questions about GnuPG to the users mailing list or
- one of the pgp newsgroups; please do not direct questions to one
- of the authors directly as we are busy working on improvements
- and bug fixes. Both mailing lists are watched by the authors
- and we try to answer questions when time allows us to do so.
- Commercial grade support for GnuPG is available; please see
- the GNU service directory or search other resources.
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.0.0 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-iQB1AwUBN+M8CB0Z9MEMmFelAQFmggMAuwHxMcQPsS1r2pD1KVZ67qTUeZnSM+wP
-daX3wnBgZzxYhzZiuciaFYky6ERC0Er4HVKtSlLBPhY1N1y2d98Se7TTUaUsVY8F
-uvGJkK/7ykaHfWgcIbKFb6hlnpy29+mO
-=1oCH
------END PGP SIGNATURE-----
diff --git a/acinclude.m4 b/acinclude.m4
index 7291c1dff..9dce2486b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -32,12 +32,12 @@ dnl Make the version number in gcrypt/gcrypt.h the same as the one here.
dnl (this is easier than to have a .in file just for one substitution)
dnl
AC_DEFUN(GNUPG_FIX_HDR_VERSION,
- [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $1 > $1.tmp
- if cmp -s $1 $1.tmp 2>/dev/null; then
- rm -f $1.tmp
+ [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > $srcdir/$1.tmp
+ if cmp -s $srcdir/$1 $srcdir/$1.tmp 2>/dev/null; then
+ rm -f $srcdir/$1.tmp
else
- rm -f $1
- if mv $1.tmp $1 ; then
+ rm -f $srcdir/$1
+ if mv $srcdir/$1.tmp $srcdir/$1 ; then
:
else
AC_MSG_ERROR([[
diff --git a/checks/genkey1024.test b/checks/genkey1024.test
index 3c62166f8..6e01a61c4 100755
--- a/checks/genkey1024.test
+++ b/checks/genkey1024.test
@@ -1,6 +1,11 @@
#!/bin/sh
+echo "test is currently disabled"
+exit 0
+
+
. $srcdir/defs.inc || exit 3
+ignore_errors=yes
if (expect -v) < /dev/null > /dev/null 2>&1 ; then
diff --git a/checks/signencrypt-dsa.test b/checks/signencrypt-dsa.test
index 8b588aa08..b93e5d359 100755
--- a/checks/signencrypt-dsa.test
+++ b/checks/signencrypt-dsa.test
@@ -1,7 +1,11 @@
#!/bin/sh
+echo "test is currently disabled"
+exit 0
+
. $srcdir/defs.inc || exit 3
+
#info Checking signing and encryption for DSA
for i in $plain_files $data_files ; do
$srcdir/run-gpg $dsa_keyrings -se -o x --yes \
diff --git a/checks/sigs-dsa.test b/checks/sigs-dsa.test
index 8f29602dd..0e14f2060 100755
--- a/checks/sigs-dsa.test
+++ b/checks/sigs-dsa.test
@@ -1,7 +1,12 @@
#!/bin/sh
+echo "test is currently disabled"
+exit 0
+
+
. $srcdir/defs.inc || exit 3
+
#info Checking DSA signatures (default digest algo)
for i in $plain_files $data_files; do
$srcdir/run-gpg $dsa_keyrings -s -o x --yes -u $dsa_usrname1 $i
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 38045bb1c..2a861c035 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,17 @@
+2000-11-14 Werner Koch <wk@gnupg.org>
+
+ * dsa.c (test_keys): Replaced mpi_alloc by gcry_mpi_new and
+ mpi_free by gcry_mpi_release.
+ * elgamal.c (test_keys,generate): Ditto, also for mpi_alloc_secure.
+ * rsa.c (test_keys,generate,rsa_verify): Ditto.
+ * primegen.c (generate_elg_prime): Ditto.
+ (gen_prime): Ditto and removed nlimbs.
+
+ * rsa.c (generate): Allocate 2 more vars in secure memory.
+
+ * Makefile.am (OMIT_DEPENDENCIES): Hack to work around dependency
+ problems.
+
2000-10-09 Werner Koch <wk@gnupg.org>
* arcfour.c, arcfour.h: New.
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 0a9b10b4c..2fadfb363 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -1,10 +1,13 @@
# Process this file with automake to produce Makefile.in
-INCLUDES = -I$(top_srcdir)/gcrypt
+INCLUDES = -I$(top_srcdir)/gcrypt -I$(top_srcdir)/mpi
noinst_LTLIBRARIES = libcipher.la
+OMIT_DEPENDENCIES = types.h gcrypt.h
+
+
# The configure script greps the module names from the EXTRA_PROGRAMS line
EXTRA_PROGRAMS = rndlinux rndunix rndegd rndw32 sha1 rmd160 md5 tiger
diff --git a/cipher/dsa.c b/cipher/dsa.c
index 255fa372c..6e41dd8b1 100644
--- a/cipher/dsa.c
+++ b/cipher/dsa.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
+
#include "g10lib.h"
#include "mpi.h"
#include "cipher.h"
@@ -136,9 +137,9 @@ static void
test_keys( DSA_secret_key *sk, unsigned qbits )
{
DSA_public_key pk;
- MPI test = mpi_alloc( qbits / BITS_PER_MPI_LIMB );
- MPI out1_a = mpi_alloc( qbits / BITS_PER_MPI_LIMB );
- MPI out1_b = mpi_alloc( qbits / BITS_PER_MPI_LIMB );
+ MPI test = gcry_mpi_new ( qbits );
+ MPI out1_a = gcry_mpi_new ( qbits );
+ MPI out1_b = gcry_mpi_new ( qbits );
pk.p = sk->p;
pk.q = sk->q;
@@ -150,9 +151,9 @@ test_keys( DSA_secret_key *sk, unsigned qbits )
if( !verify( out1_a, out1_b, test, &pk ) )
log_fatal("DSA:: sign, verify failed\n");
- mpi_free( test );
- mpi_free( out1_a );
- mpi_free( out1_b );
+ gcry_mpi_release ( test );
+ gcry_mpi_release ( out1_a );
+ gcry_mpi_release ( out1_b );
}
diff --git a/cipher/elgamal.c b/cipher/elgamal.c
index f2c029b36..c2c2c6e1a 100644
--- a/cipher/elgamal.c
+++ b/cipher/elgamal.c
@@ -121,10 +121,10 @@ static void
test_keys( ELG_secret_key *sk, unsigned nbits )
{
ELG_public_key pk;
- MPI test = mpi_alloc( 0 );
- MPI out1_a = mpi_alloc( nbits / BITS_PER_MPI_LIMB );
- MPI out1_b = mpi_alloc( nbits / BITS_PER_MPI_LIMB );
- MPI out2 = mpi_alloc( nbits / BITS_PER_MPI_LIMB );
+ MPI test = gcry_mpi_new ( 0 );
+ MPI out1_a = gcry_mpi_new ( nbits );
+ MPI out1_b = gcry_mpi_new ( nbits );
+ MPI out2 = gcry_mpi_new ( nbits );
pk.p = sk->p;
pk.g = sk->g;
@@ -141,10 +141,10 @@ test_keys( ELG_secret_key *sk, unsigned nbits )
if( !verify( out1_a, out1_b, test, &pk ) )
log_fatal("ElGamal operation: sign, verify failed\n");
- mpi_free( test );
- mpi_free( out1_a );
- mpi_free( out1_b );
- mpi_free( out2 );
+ gcry_mpi_release ( test );
+ gcry_mpi_release ( out1_a );
+ gcry_mpi_release ( out1_b );
+ gcry_mpi_release ( out2 );
}
@@ -241,8 +241,8 @@ generate( ELG_secret_key *sk, unsigned int nbits, MPI **ret_factors )
unsigned int xbits;
byte *rndbuf;
- p_min1 = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
- temp = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+ p_min1 = gcry_mpi_new ( nbits );
+ temp = gcry_mpi_new( nbits );
qbits = wiener_map( nbits );
if( qbits & 1 ) /* better have a even one */
qbits++;
@@ -265,7 +265,7 @@ generate( ELG_secret_key *sk, unsigned int nbits, MPI **ret_factors )
xbits = qbits * 3 / 2;
if( xbits >= nbits )
BUG();
- x = mpi_alloc_secure( xbits/BITS_PER_MPI_LIMB );
+ x = gcry_mpi_snew ( xbits );
if( DBG_CIPHER )
log_debug("choosing a random x of size %u", xbits );
rndbuf = NULL;
@@ -294,7 +294,7 @@ generate( ELG_secret_key *sk, unsigned int nbits, MPI **ret_factors )
} while( !( mpi_cmp_ui( x, 0 )>0 && mpi_cmp( x, p_min1 )<0 ) );
g10_free(rndbuf);
- y = mpi_alloc(nbits/BITS_PER_MPI_LIMB);
+ y = gcry_mpi_new (nbits);
gcry_mpi_powm( y, g, x, p );
if( DBG_CIPHER ) {
@@ -314,8 +314,8 @@ generate( ELG_secret_key *sk, unsigned int nbits, MPI **ret_factors )
/* now we can test our keys (this should never fail!) */
test_keys( sk, nbits - 64 );
- mpi_free( p_min1 );
- mpi_free( temp );
+ gcry_mpi_release ( p_min1 );
+ gcry_mpi_release ( temp );
}
diff --git a/cipher/primegen.c b/cipher/primegen.c
index f5dca8592..03c3c8a53 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -129,7 +129,7 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
if( DBG_CIPHER )
log_debug("gen prime: pbits=%u qbits=%u fbits=%u/%u n=%d\n",
pbits, req_qbits, qbits, fbits, n );
- prime = mpi_alloc( (pbits + BITS_PER_MPI_LIMB - 1) / BITS_PER_MPI_LIMB );
+ prime = gcry_mpi_new ( pbits );
q = gen_prime( qbits, 0, 0 );
q_factor = mode==1? gen_prime( req_qbits, 0, 0 ) : NULL;
@@ -292,7 +292,6 @@ generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
static MPI
gen_prime( unsigned nbits, int secret, int randomlevel )
{
- unsigned nlimbs;
MPI prime, ptest, pminus1, val_2, val_3, result;
int i;
unsigned x, step;
@@ -308,10 +307,9 @@ gen_prime( unsigned nbits, int secret, int randomlevel )
}
mods = g10_xmalloc( no_of_small_prime_numbers * sizeof *mods );
/* make nbits fit into MPI implementation */
- nlimbs = (nbits + BITS_PER_MPI_LIMB - 1) / BITS_PER_MPI_LIMB;
val_2 = mpi_alloc_set_ui( 2 );
val_3 = mpi_alloc_set_ui( 3);
- prime = secret? mpi_alloc_secure( nlimbs ): mpi_alloc( nlimbs );
+ prime = secret? gcry_mpi_snew ( nbits ): gcry_mpi_new ( nbits );
result = mpi_alloc_like( prime );
pminus1= mpi_alloc_like( prime );
ptest = mpi_alloc_like( prime );
diff --git a/cipher/rsa.c b/cipher/rsa.c
index f342e3c35..e7ecccbc2 100644
--- a/cipher/rsa.c
+++ b/cipher/rsa.c
@@ -61,9 +61,9 @@ static void
test_keys( RSA_secret_key *sk, unsigned nbits )
{
RSA_public_key pk;
- MPI test = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
- MPI out1 = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
- MPI out2 = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+ MPI test = gcry_mpi_new ( nbits );
+ MPI out1 = gcry_mpi_new ( nbits );
+ MPI out2 = gcry_mpi_new ( nbits );
pk.n = sk->n;
pk.e = sk->e;
@@ -77,9 +77,9 @@ test_keys( RSA_secret_key *sk, unsigned nbits )
public( out2, out1, &pk );
if( mpi_cmp( test, out2 ) )
log_fatal("RSA operation: secret, public failed\n");
- mpi_free( test );
- mpi_free( out1 );
- mpi_free( out2 );
+ gcry_mpi_release ( test );
+ gcry_mpi_release ( out1 );
+ gcry_mpi_release ( out2 );
}
/****************
@@ -107,27 +107,27 @@ generate( RSA_secret_key *sk, unsigned nbits )
/* calculate Euler totient: phi = (p-1)(q-1) */
t1 = mpi_alloc_secure( mpi_get_nlimbs(p) );
t2 = mpi_alloc_secure( mpi_get_nlimbs(p) );
- phi = mpi_alloc_secure( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
- g = mpi_alloc_secure( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
- f = mpi_alloc_secure( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+ phi = gcry_mpi_snew ( nbits );
+ g = gcry_mpi_snew ( nbits );
+ f = gcry_mpi_snew ( nbits );
mpi_sub_ui( t1, p, 1 );
mpi_sub_ui( t2, q, 1 );
mpi_mul( phi, t1, t2 );
mpi_gcd(g, t1, t2);
mpi_fdiv_q(f, phi, g);
/* multiply them to make the private key */
- n = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+ n = gcry_mpi_new ( nbits );
mpi_mul( n, p, q );
/* find a public exponent */
- e = mpi_alloc( (6+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+ e = gcry_mpi_new ( 6 );
mpi_set_ui( e, 17); /* start with 17 */
while( !mpi_gcd(t1, e, phi) ) /* (while gcd is not 1) */
mpi_add_ui( e, e, 2);
/* calculate the secret key d = e^1 mod phi */
- d = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+ d = gcry_mpi_snew ( nbits );
mpi_invm(d, e, f );
/* calculate the inverse of p and q (used for chinese remainder theorem)*/
- u = mpi_alloc( (nbits+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB );
+ u = gcry_mpi_snew ( nbits );
mpi_invm(u, p, q );
if( DBG_CIPHER ) {
@@ -142,11 +142,11 @@ generate( RSA_secret_key *sk, unsigned nbits )
log_mpidump(" u= ", u );
}
- mpi_free(t1);
- mpi_free(t2);
- mpi_free(phi);
- mpi_free(f);
- mpi_free(g);
+ gcry_mpi_release (t1);
+ gcry_mpi_release (t2);
+ gcry_mpi_release (phi);
+ gcry_mpi_release (f);
+ gcry_mpi_release (g);
sk->n = n;
sk->e = e;
@@ -416,11 +416,11 @@ rsa_verify( int algo, MPI hash, MPI *data, MPI *pkey,
return GCRYERR_INV_PK_ALGO;
pk.n = pkey[0];
pk.e = pkey[1];
- result = mpi_alloc( (160+BITS_PER_MPI_LIMB-1)/BITS_PER_MPI_LIMB);
+ result = gcry_mpi_new ( 160 );
public( result, data[0], &pk );
/*rc = (*cmp)( opaquev, result );*/
rc = mpi_cmp( result, hash )? GCRYERR_BAD_SIGNATURE:0;
- mpi_free(result);
+ gcry_mpi_release (result);
return rc;
}
diff --git a/configure.in b/configure.in
index ca0d04673..4ef6be25d 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ AC_CANONICAL_SYSTEM
# AGE, set REVISION to 0.
# 3. Interfaces removed (BAD, breaks upward compatibility): Increment
# CURRENT, set AGE and REVISION to 0.
-AM_INIT_AUTOMAKE(gnupg,1.1.1a)
+AM_INIT_AUTOMAKE(gnupg,1.1.1b)
LIBGCRYPT_LT_CURRENT=1
LIBGCRYPT_LT_AGE=0
LIBGCRYPT_LT_REVISION=0
@@ -710,7 +710,7 @@ AC_SUBST(ZLIBS)
# Allow users to append something to the version string without
-# flagging it as development version. The user version parts is
+# flagging it as development version. The user version part is
# considered everything after a dash.
changequote(,)dnl
tmp_pat='[a-zA-Z]'
@@ -719,9 +719,9 @@ if echo "$VERSION" | sed 's/-.*//' | grep "$tmp_pat" >/dev/null ; then
AC_DEFINE(IS_DEVELOPMENT_VERSION)
fi
-dnl Temp workarounds:
+dnl Temp workarounds
GNUPG_LINK_FILES(gcrypt/gcrypt.h, gcrypt.h )
-GNUPG_LINK_FILES(include/types.h, gcrypt/types.h )
+GNUPG_LINK_FILES(include/types.h, types.h )
AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
@@ -739,7 +739,7 @@ fi
dnl
dnl Make the version number in gcrypt/gcrypt.h the same as the one here.
-dnl (this is easier than to have a .in file just for one substitution)
+dnl (this is easier than to have a *.in file just for one substitution)
dnl
GNUPG_FIX_HDR_VERSION(gcrypt/gcrypt.h, GCRYPT_VERSION)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 23876dea9..a594205a4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,18 +3,19 @@
BUILT_SOURCES = version.sgml gcryptref.html gcryptref.ps
-EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP \
- version.sgml.in $(BUILT_SOURCES)
+#EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP \
+# version.sgml.in $(BUILT_SOURCES)
+EXTRA_DIST = DETAILS HACKING OpenPGP FAQ
-man_MANS = gpg.1
+#man_MANS = gpg.1
-pkgdata_DATA = gcryptref.html gcryptref.ps
+### pkgdata_DATA = gcryptref.html gcryptref.ps
CLEANFILES = gcryptref.aux gcryptref.log gcryptref.tex gcryptref.dvi
-gcryptref.sgml : version.sgml
+# gcryptref.sgml : version.sgml
if HAVE_DB2MAN
@@ -40,3 +41,5 @@ endif
+
+
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 4fb562ff6..9c5acd8a1 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-13 Werner Koch <wk@gnupg.org>
+
+ * Makefile.am: Do not install any program
+
+2000-10-12 Werner Koch <wk@gnupg.org>
+
+ * keygen.c (keygen_add_std_prefs): Add Rijndael to the prefs.
+
2000-10-11 Werner Koch <wk@gnupg.org>
* packet.h: Add features sig subpacket definition.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index b6b0275ef..7b78cc9ef 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -10,7 +10,8 @@ needed_libs = ../util/libutil.la ../gcrypt/libgcrypt.la \
../jnlib/libjnlib.la ../util/libutil.la
#noinst_PROGRAMS = gpgd
-bin_PROGRAMS = gpg kbxutil
+#bin_PROGRAMS = gpg kbxutil
+noinst_PROGRAMS = gpg kbxutil
common_source = \
build-packet.c \
diff --git a/g10/keygen.c b/g10/keygen.c
index 790dd58ba..1e2accd0c 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -135,10 +135,11 @@ keygen_add_std_prefs( PKT_signature *sig, void *opaque )
keygen_add_key_expire( sig, opaque );
- buf[0] = GCRY_CIPHER_TWOFISH;
- buf[1] = GCRY_CIPHER_CAST5;
- buf[2] = GCRY_CIPHER_BLOWFISH;
- build_sig_subpkt( sig, SIGSUBPKT_PREF_SYM, buf, 3 );
+ buf[0] = GCRY_CIPHER_RIJNDAEL;
+ buf[1] = GCRY_CIPHER_TWOFISH;
+ buf[2] = GCRY_CIPHER_CAST5;
+ buf[3] = GCRY_CIPHER_BLOWFISH;
+ build_sig_subpkt( sig, SIGSUBPKT_PREF_SYM, buf, 4 );
buf[0] = GCRY_MD_RMD160;
buf[1] = GCRY_MD_SHA1;
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 64b0b3867..95bb6f1d2 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-14 Werner Koch <wk@gnupg.org>
+
+ * mpi-internal.h, mpi.h: Changed the way they are called and
+ introduced DID_MPI_LIMP_TYPEDEF hack. Very ugly, should all be
+ revamped.
+
+ * Makefile.am (OMIT_DEPENDENCIES): Hack to work around dependency
+ problems.
+
2000-10-11 Werner Koch <wk@gnupg.org>
* generic/mpi-asm-defs.h: New.
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index f7567e5f2..a9df442e6 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to produce Makefile.in
-
-INCLUDES = -I$(top_srcdir)/gcrypt
+INCLUDES = -I$(top_srcdir)/gcrypt
CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@
ASFLAGS = @MPI_SFLAGS@
@@ -12,6 +11,8 @@ DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S \
# CLEANFILES = _*.s
CLEANFILES = *.s
+OMIT_DEPENDENCIES = types.h gcrypt.h
+
noinst_LTLIBRARIES = libmpi.la
libmpi_la_LDFLAGS =
@@ -33,7 +34,8 @@ libmpi_la_SOURCES = longlong.h \
mpih-cmp.c \
mpih-div.c \
mpih-mul.c \
- mpiutil.c
+ mpiutil.c \
+ mpi.h
# Note this objects are actually links, the sourcefiles are
# distributed by special code in dist-hook
@@ -63,3 +65,4 @@ libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
# $(COMPILE) -c _$*.s
# mv -f _$*.o $*.o
+
diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h
index c25f966a9..3bd1b611f 100644
--- a/mpi/generic/mpi-asm-defs.h
+++ b/mpi/generic/mpi-asm-defs.h
@@ -1,8 +1,7 @@
/* This file defines some basic constants for the MPI machinery. We
* need to define the types on a per-CPU basis, so it is done with
* this file here. */
-#define BYTES_PER_MPI_LIMB (sizeof unsigned long)
-
+#define BYTES_PER_MPI_LIMB (SIZEOF_UNSIGNED_LONG)
diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
index cde1c0ce2..3a7855de8 100644
--- a/mpi/mpi-internal.h
+++ b/mpi/mpi-internal.h
@@ -30,6 +30,24 @@
#ifndef G10_MPI_INTERNAL_H
#define G10_MPI_INTERNAL_H
+#include "mpi-asm-defs.h"
+#if BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_INT
+ typedef unsigned int mpi_limb_t;
+ typedef signed int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_LONG
+ typedef unsigned long int mpi_limb_t;
+ typedef signed long int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_LONG_LONG
+ typedef unsigned long long int mpi_limb_t;
+ typedef signed long long int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_SHORT
+ typedef unsigned short int mpi_limb_t;
+ typedef signed short int mpi_limb_signed_t;
+#else
+ #error BYTES_PER_MPI_LIMB does not match any C type
+#endif
+#define BITS_PER_MPI_LIMB (8*BYTES_PER_MPI_LIMB)
+#define DID_MPI_LIMB_TYPEDEF 1
#include "mpi.h"
/* If KARATSUBA_THRESHOLD is not already defined, define it to a
diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c
index 9c68d7c9b..87f5870c9 100644
--- a/mpi/mpicoder.c
+++ b/mpi/mpicoder.c
@@ -24,9 +24,7 @@
#include <stdlib.h>
#include <assert.h>
-#include "mpi.h"
#include "mpi-internal.h"
-#include "memory.h"
#include "g10lib.h"
#define MAX_EXTERN_MPI_BITS 16384
diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
index 2dad135d4..3c5aee057 100644
--- a/mpi/mpiutil.c
+++ b/mpi/mpiutil.c
@@ -25,7 +25,6 @@
#include <assert.h>
#include "g10lib.h"
-#include "mpi.h"
#include "mpi-internal.h"
#include "memory.h"
diff --git a/po/da.po b/po/da.po
index 3bd6d6525..d29dc2452 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 2000-03-07 22:51+01:00\n"
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -241,7 +241,7 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "du fandt en fejl ... (%s:%d)\n"
-#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke åbne '%s': %s\n"
@@ -1226,66 +1226,66 @@ msgstr "%s: udelod: offentlignøgle er slået fra\n"
msgid "no valid addressees\n"
msgstr "ingen gyldige adresser\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "skriver selvsignatur\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr ""
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ønsket nøglestørrelse er %u bit\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA og ElGamal (standard)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (signér kun)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (kryptér kun)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (signér og kryptér)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (signér og kryptér)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Dit valg? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? "
-#: g10/keygen.c:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Ugyldigt valg.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1294,19 +1294,19 @@ msgid ""
" highest suggested keysize is 2048 bits\n"
msgstr ""
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Hvilken nøglestørrelse ønsker du? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr ""
-#: g10/keygen.c:704
+#: g10/keygen.c:708
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
@@ -1318,42 +1318,42 @@ msgstr ""
#. * 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:715
+#: g10/keygen.c:719
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr ""
-#: g10/keygen.c:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
msgstr ""
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
msgstr ""
-#: g10/keygen.c:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr ""
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Ønsket nøglestørrelse er %u bit\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1363,36 +1363,36 @@ msgid ""
" <n>y = key expires in n years\n"
msgstr ""
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "Nøgle er gyldig for? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "ugyldig værdi\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
msgid "Key does not expire at all\n"
msgstr "Nøglen udløber aldrig\n"
#. print the date when the key expires
-#: g10/keygen.c:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "Nøgle udløber d. %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
# virker j automatisk istedetfor y?
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Er dette korrekt (j/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1402,44 +1402,44 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Rigtige navn: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Navn må ikke starte med et tal\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal være mindst 5 bogstaver langt\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruger '%s' tegnsættet.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1450,28 +1450,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
-#: g10/keygen.c:983
+#: g10/keygen.c:987
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
-#: g10/keygen.c:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1479,11 +1479,11 @@ msgstr ""
"Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1491,7 +1491,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1499,52 +1499,52 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA nøglepar vil have 1024 bit.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Nøgleoprettelse annulleret.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentligt certifikat til '%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nøgle oprettet og signeret.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
msgstr ""
-#: g10/keygen.c:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Vil du virkelig oprette?"
@@ -2578,7 +2578,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr ""
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index a2e3138b2..2e20ed80c 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-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 2000-06-12 12:50+0200\n"
"Last-Translator: Walter Koch <koch@hsp.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -238,7 +238,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -1279,68 +1279,68 @@ msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
msgid "no valid addressees\n"
msgstr "Keine gültigen Adressaten\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "Die Eigenbeglaubigung wird geschrieben\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ungültig Schlüssellänge; %u Bit werden verwendet\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
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:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA und ElGamal (voreingestellt)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur signieren/beglaubigen)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur verschlüsseln)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Ihre Auswahl? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Ungültige Auswahl.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1353,19 +1353,19 @@ msgstr ""
" standard Schlüssellänge ist 1024 Bit\n"
" größte sinnvolle Schlüssellänge ist 2048 Bit\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Welche Schlüssellänge wünschen Sie? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
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:702
+#: g10/keygen.c:706
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:704
+#: g10/keygen.c:708
#, 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"
@@ -1378,12 +1378,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1391,11 +1391,11 @@ msgstr ""
"Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n"
"Berechnungen dann WIRKLICH lange brauchen!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1403,21 +1403,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:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Brauchen Sie wirklich einen derartig langen Schlüssel? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1433,25 +1433,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:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "Der Schlüssel bleibt wie lange gültig? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "Ungültiger Wert.\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
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:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "Der Schlüssel verfällt am %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1459,11 +1459,11 @@ msgstr ""
"Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
"Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Ist dies richtig? (j/n) "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1479,44 +1479,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Ungültiges Zeichen im Namen\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "E-Mail-Adresse: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Diese E-Mail-Adresse ist ungültig\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Ungültiges Zeichen im Kommentar.\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1527,27 +1527,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
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:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfBb"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1555,11 +1555,11 @@ msgstr ""
"Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1572,7 +1572,7 @@ msgstr ""
"aufrufen.\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1583,29 +1583,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:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Der DSA Schlüssel wird 1024 Bit haben.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, c-format
msgid "writing public key to `%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1614,12 +1614,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:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1627,7 +1627,7 @@ msgstr ""
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1635,7 +1635,7 @@ msgstr ""
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Wirklich erzeugen? "
@@ -2693,7 +2693,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
diff --git a/po/eo.po b/po/eo.po
index b8003eb79..8c1e2803e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 2000-06-02 21:04+01:00\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -239,7 +239,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
@@ -1253,66 +1253,66 @@ msgstr "%s: ignorita: publika þlosilo estas malþaltita\n"
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "skribas mem-subskribon\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "skribas þlosilbindan subskribon\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "þlosilgrando nevalida; uzas %u bitojn\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "þlosilgrando rondigita øis %u bitoj\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur æifri)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (subskribi kaj æifri)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (subskribi kaj æifri)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Via elekto? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1325,19 +1325,19 @@ msgstr ""
" implicita þlosilgrando estas 1024 bitoj\n"
" plej granda rekomendata þlosilgrando estas 2048 bitoj\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Kiun þlosilgrandon vi deziras? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permesas þlosilgrandon nur inter 512 kaj 1024\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
-#: g10/keygen.c:704
+#: g10/keygen.c:708
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
@@ -1350,12 +1350,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1363,11 +1363,11 @@ msgstr ""
"Þlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
"æar la komputado daýras TRE longe!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Æu vi estas certa, ke vi deziras æi tiun þlosilgrandon? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1375,21 +1375,21 @@ msgstr ""
"Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
"facile kaptebla!\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Æu vi vere bezonas tiom grandan þlosilgrandon? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Petita þlosilgrando estas %u bitoj\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita øis %u bitoj\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1405,25 +1405,25 @@ msgstr ""
" <n>m = þlosilo eksvalidiøos post n monatoj\n"
" <n>y = þlosilo eksvalidiøos post n jaroj\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "Þlosilo validu ...? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "nevalida valoro\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
msgid "Key does not expire at all\n"
msgstr "Þlosilo neniam eksvalidiøos\n"
#. print the date when the key expires
-#: g10/keygen.c:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "Þlosilo eksvalidiøos je %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1431,11 +1431,11 @@ msgstr ""
"Via sistemo ne povas montri datojn post 2038.\n"
"Tamen, øi estos øuste traktata øis 2106.\n"
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Æu tio estas øusta (j/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1450,44 +1450,44 @@ msgstr ""
" \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Vera nomo: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komenciøi per cifero\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almenaý 5 signojn\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Retadreso: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Komento: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1498,27 +1498,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bonvolu ne meti la retadreson en la veran nomon aý la komenton\n"
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Þanøu (N)omon, (K)omenton, (A)adreson, aý (F)ini? "
-#: g10/keygen.c:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1526,11 +1526,11 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "la pasfrazo ne estis øuste ripetita; provu denove.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1542,7 +1542,7 @@ msgstr ""
"uzante æi tiun programon kun la opcio \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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 +1554,29 @@ msgstr ""
"kreado de la primoj; tio donas al la stokastilo pli bonan þancon\n"
"akiri sufiæe da entropio.\n"
-#: g10/keygen.c:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA-þlosilparo havos 1024 bitojn.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Kreado de þlosiloj nuligita.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skribas publikan þlosilon al '%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skribas sekretan þlosilon al '%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta þlosiloj kreitaj kaj subskribitaj.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1584,12 +1584,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:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de þlosiloj malsukcesis: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1597,7 +1597,7 @@ msgstr ""
"þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý "
"horloøeraro)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1605,7 +1605,7 @@ msgstr ""
"þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý "
"horloøeraro)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Æu vere krei? "
@@ -2650,7 +2650,7 @@ msgstr "æi tiu æifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
msgid "can't handle public key algorithm %d\n"
msgstr "ne povas trakti publikþlosilan metodon %d\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 9463c0a68..ac414ac36 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-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\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"
@@ -248,7 +248,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no puede abrirse `%s': %s\n"
@@ -1271,66 +1271,66 @@ msgstr "%s: ignorado: clave pública deshabilitada\n"
msgid "no valid addressees\n"
msgstr "no hay direcciones válidas\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "escribiendo autofirma\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobación de clave\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "El tamaño requerido es de %u bits\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA y ElGamal (por defecto)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (sólo firma)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (sólo cifrado)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (firma y cifrado)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (firma y cifrado)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Su elección: "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Elección no válida.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1343,19 +1343,19 @@ msgstr ""
" el tamaño por defecto es 1024 bits\n"
" el tamaño máximo recomendado es 2048 bits\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "¿De qué tamaño quiere la clave (1024)? "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
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:702
+#: g10/keygen.c:706
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:704
+#: g10/keygen.c:708
#, 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"
@@ -1368,12 +1368,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1381,11 +1381,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:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "¿Seguro que quiere una clave de este tamaño? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1394,21 +1394,21 @@ msgstr ""
"teclado\n"
"también son vulnerables a un ataque!\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "¿De verdad necesita una clave tan grande? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "El tamaño requerido es de %u bits\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1424,35 +1424,35 @@ msgstr ""
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n años\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "¿Validez de la clave (0)? "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "valor no válido\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
msgid "Key does not expire at all\n"
msgstr "La clave nunca caduca\n"
#. print the date when the key expires
-#: g10/keygen.c:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "La clave caduca el %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "¿Es correcto (s/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1470,44 +1470,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Nombre y apellidos: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Caracter no válido en el nombre\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un número\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Dirección de correo electrónico: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Dirección no válida\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Caracter no válido en el comentario\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Está usando el juego de caracteres `%s'.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1518,28 +1518,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, 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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1547,11 +1547,11 @@ msgstr ""
"Necesita una contraseña para proteger su clave secreta.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "contraseña repetida incorrecta, inténtelo de nuevo.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1563,7 +1563,7 @@ msgstr ""
"la opción \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1576,29 +1576,29 @@ msgstr ""
"generador de números aleatorios mayor oportunidad de recoger suficiente\n"
"entropía.\n"
-#: g10/keygen.c:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "El par de claves DSA tendrá 1024 bits.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Creación de claves cancelada.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escribiendo certificado público en `%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escribiendo certificado privado en `%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "Claves pública y secreta creadas y firmadas.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1607,12 +1607,12 @@ msgstr ""
"el comando \"--edit-key\" para crear una clave secundaria con este "
"propósito.\n"
-#: g10/keygen.c:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creación de la clave fallida: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1620,7 +1620,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:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1628,7 +1628,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:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "¿Crear de verdad? "
@@ -2677,7 +2677,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "no puedo manejar el algoritmo de clave pública %d\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
diff --git a/po/fr.po b/po/fr.po
index 7def3e1bb..07e86f5a9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 2000-06-28 18:41+02:00\n"
"Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -244,7 +244,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossible d'ouvrir `%s': %s\n"
@@ -1276,67 +1276,67 @@ msgid "no valid addressees\n"
msgstr "pas de destinataire valide\n"
# g10/keygen.c:123 ???
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "écriture de l'auto-signature\n"
# g10/keygen.c:161 ???
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "écriture de la signature de liaison\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Taille invalide; utilisation de %u bits\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie à %u bits\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Sélectionnez le type de clé désiré:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA et ElGamal (par défaut)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (signature seule)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (chiffrement seul)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (signature et chiffrement)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (signature et chiffrement)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Votre choix ? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Choix invalide.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1349,19 +1349,19 @@ msgstr ""
" la taille par défaut est 1024 bits\n"
" la taille maximale conseillée est 2048 bits\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Quelle taille de clé désirez-vous ? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
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:702
+#: g10/keygen.c:706
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:704
+#: g10/keygen.c:708
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"
@@ -1373,12 +1373,12 @@ msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1386,11 +1386,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:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Etes-vous sûr de vouloir cette taille ? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1398,21 +1398,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:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Avez-vous réellement besoin d'une taille aussi grande ? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La taille demandée est %u bits\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie à %u bits\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1428,25 +1428,25 @@ msgstr ""
" <n>m = la clé expire dans n mois\n"
" <n>y = la clé expire dans n ans\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "La clé est valide pour ? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "valeur invalide\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
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:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "La clé expire le %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1454,11 +1454,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:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Est-ce correct (o/n) ? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1474,44 +1474,44 @@ msgstr ""
" « Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> »\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Nom réel: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Caractère invalide dans le nom\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
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:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Adresse e-mail: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse e-mail valide\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Commentaire: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Caractère invalide dans le commentaire\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vous utilisez le jeu de caractères '%s'.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1522,28 +1522,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
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:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr "Corrigez l'erreur d'abord\n"
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1551,11 +1551,11 @@ msgstr ""
"Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
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:1054
+#: g10/keygen.c:1058
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"
@@ -1567,7 +1567,7 @@ msgstr ""
"le désirez, en utilisant ce programme avec l'option « --edit-key ».\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1579,29 +1579,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:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "La paire de clés DSA fera 1024 bits.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "La génération de clé a été annulée.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, c-format
msgid "writing public key to `%s'\n"
msgstr "écriture de la clé publique vers `%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "écriture de la clé secrète vers `%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
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:1762
+#: g10/keygen.c:1766
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"
@@ -1610,13 +1610,13 @@ msgstr ""
"utiliser la commande «--edit-key» pour générer une clé secondaire à\n"
"cette fin.\n"
-#: g10/keygen.c:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, 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:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1624,7 +1624,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:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1632,7 +1632,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:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Créer vraiment ? "
@@ -2681,7 +2681,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "impossible de gérer l'algorithme à clé publique %d\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un sous-paquet de type %d possède un bit critique\n"
diff --git a/po/id.po b/po/id.po
index 0ae4c61b1..ab6194b20 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-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 2000-02-06 18:04+07:00\n"
"Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
"Language-Team: Indonesia <id@li.org>\n"
@@ -239,7 +239,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@ -1248,66 +1248,66 @@ msgstr "%s: dilewati: kunci publik dimatikan\n"
msgid "no valid addressees\n"
msgstr "tidak ada alamat yang valid\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "menulis self signature\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Keysize yang diminta adalah %u bit\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (hanya menandai)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (tandai dan enkripsi)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (tandai dan enkripsi)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Pilihan anda? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
msgid "Do you really want to create a sign and encrypt key? "
msgstr "Anda ingin membuat kunci sign dan enkripsi? "
-#: g10/keygen.c:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Pilihan tidak valid.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1320,19 +1320,19 @@ msgstr ""
" keysize default adalah 1024 bit\n"
" keysize tertinggi dianjurkan 2048 bit\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Keysize yang anda inginkan? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
-#: g10/keygen.c:704
+#: g10/keygen.c:708
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
@@ -1345,12 +1345,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1358,11 +1358,11 @@ msgstr ""
"Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
"komputasi akan sangat lama!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Apakah anda yakin memerlukan keysize ini? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1370,21 +1370,21 @@ msgstr ""
"Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
"diserang!\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Keysize yang diminta adalah %u bit\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1400,35 +1400,35 @@ msgstr ""
" <n>m = kunci berakhir dalam n bulan\n"
" <n>y = kunci berakhir dalam n tahun\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "Kunci valid untuk? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "nilai yang tidak valid\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
msgid "Key does not expire at all\n"
msgstr "Kunci tidak pernah berakhir\n"
#. print the date when the key expires
-#: g10/keygen.c:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "Kunci berakhir pada %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Benar (y/t)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1443,44 +1443,44 @@ msgstr ""
"user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Nama sebenarnya: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Alamat email: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Komentar: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1490,28 +1490,28 @@ msgstr ""
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, 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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1519,11 +1519,11 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1535,7 +1535,7 @@ msgstr ""
"saat,\n"
"menggunakan program ini dengan pilihan \"--edit-key\".\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1547,29 +1547,29 @@ msgstr ""
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
-#: g10/keygen.c:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Keypair DSA akan memiliki 1024 bit.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "menulis sertifikat publik ke `%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "menulis sertifikat rahasia ke `%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1578,26 +1578,26 @@ msgstr ""
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
-#: g10/keygen.c:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, 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:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, 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:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Ingin diciptakan? "
@@ -2643,7 +2643,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "tidak dapat menangani algoritma kunci publik %d\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
diff --git a/po/it.po b/po/it.po
index ee47cb190..ecc28271d 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-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 1999-12-08 15:51+02:00\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -239,7 +239,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
@@ -1256,66 +1256,66 @@ msgstr "%s: saltato: chiave pubblica disabilitata\n"
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "scrittura della autofirma\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "La dimensione richiesta della chiave è %u bit\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA e ElGamal (default)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (firma solo)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (cifra solo)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (firma e cifra)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (firma e cifra)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Cosa scegli? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Scelta non valida.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1328,19 +1328,19 @@ msgstr ""
" la dimensione predefinita è 1024 bit\n"
" la dimensione massima consigliata è 2048 bit\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
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:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
-#: g10/keygen.c:704
+#: g10/keygen.c:708
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
@@ -1353,12 +1353,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1366,11 +1366,11 @@ msgstr ""
"Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n"
"VERAMENTE lunghi!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1378,21 +1378,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:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Ti serve davvero una chiave così lunga? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La dimensione richiesta della chiave è %u bit\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1408,25 +1408,25 @@ msgstr ""
" <n>m = la chiave scadrà dopo n mesi\n"
" <n>y = la chiave scadrà dopo n anni\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "Chiave valida per? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "valore non valido\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
msgid "Key does not expire at all\n"
msgstr "La chiave non scade\n"
#. print the date when the key expires
-#: g10/keygen.c:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "La chiave scadrà il %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1434,11 +1434,11 @@ msgstr ""
"Il tuo sistema non può mostrare date oltre il 2038.\n"
"Comunque, sarà gestita correttamente fino al 2106.\n"
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "È giusto (s/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1454,44 +1454,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Nome e Cognome: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Il nome non può iniziare con una cifra\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Indirizzo di Email: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non è valido\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Commento: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1502,28 +1502,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, 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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1531,11 +1531,11 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "passphrase non ripetuta correttamente; riprova.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1547,7 +1547,7 @@ msgstr ""
"programma con l'opzione \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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 +1559,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:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "La coppia DSA avrà 1024 bit.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "scrittura del certificato pubblico in `%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "scrittura del certificato segreto in `%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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 +1590,12 @@ msgstr ""
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
-#: g10/keygen.c:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1603,7 +1603,7 @@ msgstr ""
"la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1611,7 +1611,7 @@ msgstr ""
"la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Crea davvero? "
@@ -2659,7 +2659,7 @@ msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n"
msgid "can't handle public key algorithm %d\n"
msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
diff --git a/po/ja.po b/po/ja.po
index 78d002ee9..d4666da01 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-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 2000-02-16 20:10+09:00\n"
"Last-Translator: IIDA Yosiaki <iida@secom.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -241,7 +241,7 @@ msgstr "... ¥Ð¥°¤Ç¤¹ (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤è¤¦¤Ç¤¹ ... (%s:%d)\n"
-#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
@@ -1246,66 +1246,66 @@ msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤ò̵»ë¤·¤Þ¤·¤¿\n"
msgid "no valid addressees\n"
msgstr "Í­¸ú¤Ê¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "¼«¸Ê½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "½ð̾¤ËÂбþ¤¹¤ë¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ²¼¤µ¤¤:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA ¤È ElGamal (¥Ç¥Õ¥©¥ë¥È)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (½ð̾¤Î¤ß)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
msgid "Do you really want to create a sign and encrypt key? "
msgstr "ËÜÅö¤Ë½ð̾¤È°Å¹æÍѤθ°¤òºî¤ê¤Þ¤¹¤«? "
-#: g10/keygen.c:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1318,19 +1318,19 @@ msgstr ""
" ¥Ç¥Õ¥©¥ë¥È¤Î¸°¥µ¥¤¥º¤Ï 1024 ¥Ó¥Ã¥È\n"
" ºÇÂç¤Î¸°¥µ¥¤¥º¤Ï 2048 ¥Ó¥Ã¥È\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "¤É¤Î¸°¥µ¥¤¥º¤òÁªÂò¤·¤Þ¤¹¤«? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA ¤Î¸°¥µ¥¤¥º¤Ï 512 ¤«¤é 1024 ¤Þ¤Ç¤Ç¤¹\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n"
-#: g10/keygen.c:704
+#: g10/keygen.c:708
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n"
@@ -1343,12 +1343,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:715
+#: g10/keygen.c:719
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "¸°¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹; %d ¤¬ºÇÂç¤Ç¤¹¡£\n"
-#: g10/keygen.c:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1356,11 +1356,11 @@ msgstr ""
"2048 °Ê¾å¤Î¸°¥µ¥¤¥º¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n"
"¿ä¾©¤·¤Þ¤»¤ó!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "¤³¤Î¸°¥µ¥¤¥º¤ÇËÜÅö¤ËÎɤ¤¤Ç¤¹¤«? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1368,21 +1368,21 @@ msgstr ""
"¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢¹¶·â¤ËÂФ·¤Æ "
"¤¹¤­¤À¤é¤±¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ²¼¤µ¤¤!\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "¤¢¤Ê¤¿¤ÏËÜÅö¤Ë¤³¤Î¤è¤¦¤ÊŤ¤¸°¤¬É¬ÍפǤ¹¤«? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1398,25 +1398,25 @@ msgstr ""
" <n>m = Í­¸ú´ü¸Â n ·î\n"
" <n>y = Í­¸ú´ü¸Â n ǯ\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "¸°¤ÎÍ­¸úÀ­¤Ï? (0)"
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "̵¸ú¤ÊÃÍ\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
msgid "Key does not expire at all\n"
msgstr "¸°¤Ï̵´ü¸Â¤Ç¤¹\n"
#. print the date when the key expires
-#: g10/keygen.c:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1424,11 +1424,11 @@ msgstr ""
"¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n"
"2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯½èÍý¤Ç¤­¤Þ¤¹¡£\n"
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "¤³¤ì¤ÇÎɤ¤¤Ç¤¹¤« (y/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1444,44 +1444,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "ËÜ̾: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "̾Á°¤Ï¿ô»ú¤Ç»Ï¤Þ¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "̾Á°¤Ï 5 ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Ãí¼á: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Ãí¼á¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "¤¢¤Ê¤¿¤Ïʸ»ú¥³¡¼¥É `%s' ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1492,28 +1492,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, 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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1521,11 +1521,11 @@ msgstr ""
"ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬É¬ÍפǤ¹¡£\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤â¤¦°ìÅÙÀßÄꤷ¤Æ²¼¤µ¤¤¡£\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1537,7 +1537,7 @@ msgstr ""
"¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1548,29 +1548,29 @@ msgstr ""
"¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ê¤É¤Î¾¤Î¹ÔÆ°¤òƱ»þ¤Ë¹Ô¤¦¤È¡¢Íð¿ôÀ¸À®ÁõÃ֤ˤÆ\n"
"Í𻨤µ¤ÎÂ礭¤ÊÎɤ¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ê¤Þ¤¹¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n"
-#: g10/keygen.c:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA ¸°¥Ú¥¢¤Ï 1024 ¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "`%s' ¤Ø¤Î¸ø³«¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "`%s' ¤Ø¤ÎÈëÌ©¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤¬ºîÀ®¤µ¤ì¡¢½ð̾¤µ¤ì¤Þ¤·¤¿¡£\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1578,24 +1578,24 @@ msgstr ""
"¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n"
"\"--edit-key\" ¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
-#: g10/keygen.c:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "¸°¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "¸°¤Ï %lu ÉÃ̤Íè¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "¸°¤Ï %lu ÉÃ̤Íè¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "ËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? "
@@ -2638,7 +2638,7 @@ msgstr "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£°ìÈÌŪ¤ÊÊýË¡¤òÍѤ¤¤Æ²¼¤µ¤¤!\n"
msgid "can't handle public key algorithm %d\n"
msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à %d ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacket of type %d has critical bit set\n"
diff --git a/po/nl.po b/po/nl.po
index 5053733ba..62f04e114 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-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 2000-02-20 21:30+01:00\n"
"Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -239,7 +239,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan `%s' niet openen: %s\n"
@@ -1267,66 +1267,66 @@ msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
msgid "no valid addressees\n"
msgstr "geen geldige adressen\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "zelfondertekening wegschrijven\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "schrijven van sleutelbindingsondertekening\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Gevraagde sleutellengte is %u bits\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "afgerond naar %u bits\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Selecteer aub wat voor sleutel u wilt:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA en ElGamal (standaard)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (alleen ondertekenen)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (alleen versleutelen)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (ondertekenen en versleutelen)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (ondertekenen en versleutelen)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Uw keuze? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Ongeldige keuze.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1339,19 +1339,19 @@ msgstr ""
" standaard sleutellengte is 1024 bits\n"
" hoogste aan te raden sleutellengte is 2048 bits\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Hoe lang wil je de sleutel maken? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
-#: g10/keygen.c:704
+#: g10/keygen.c:708
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
@@ -1364,12 +1364,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:715
+#: g10/keygen.c:719
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "sleutel te lang; %d is de maximumlengte.\n"
-#: g10/keygen.c:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1377,11 +1377,11 @@ msgstr ""
"Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
"lang duren!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1389,21 +1389,21 @@ msgstr ""
"Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
"erg vatbaar zijn voor aanvallen!\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Heb je echt een sleutel nodig die zo lang is? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Gevraagde sleutellengte is %u bits\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "afgerond naar %u bits\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1419,26 +1419,26 @@ msgstr ""
" <n>m = sleutel verloopt over n maanden\n"
" <n>y = sleutel verloopt over n jaar\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "Sleutel is geldig gedurende? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "ongeldige waarde\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
msgid "Key does not expire at all\n"
msgstr "Sleutel verloopt nooit\n"
#. print the date when the key expires
-#: g10/keygen.c:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "Sleutel verloopt op %s\n"
# fixme
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1446,11 +1446,11 @@ msgstr ""
"Uw systeem kan geen data weergeven van na 2038.\n"
"Desondanks wordt het goed behandeld tot 2106.\n"
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Klopt dit (j/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1466,44 +1466,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Echte naam: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Ongeldig teken in naam\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Naam mag niet beginnen met een cijfer\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "Naam moet ten minste 5 tekens lang zijn\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Email Adres: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Ongeldig email adres\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Ongeldig teken in kommentaar\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Je gebruik tekenverzameling `%s'.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1514,28 +1514,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoEe"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, 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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1543,11 +1543,11 @@ msgstr ""
"Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1559,7 +1559,7 @@ msgstr ""
"nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1572,29 +1572,29 @@ msgstr ""
"dit geeft de generator een grotere kans om genoeg entropie te\n"
"verzamelen.\n"
-#: g10/keygen.c:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Sleutelgeneratie afgebroken.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1603,12 +1603,12 @@ msgstr ""
"U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
"sleutel te maken hiervoor.\n"
-#: g10/keygen.c:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Sleutelgeneratie is mislukt: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1616,7 +1616,7 @@ msgstr ""
"Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
"klokprobleem)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1624,7 +1624,7 @@ msgstr ""
"sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
"klokprobleem)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Echt maken? "
@@ -2681,7 +2681,7 @@ msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
msgid "can't handle public key algorithm %d\n"
msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpakket type %d heeft kritische bit gezet\n"
diff --git a/po/pl.po b/po/pl.po
index 41ed74ef2..ab47df1fb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 1999-12-05 21:29+01:00\n"
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -249,7 +249,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nie mo¿na otworzyæ %s: %s\n"
@@ -1269,66 +1269,66 @@ msgstr "%s: pominiêty: klucz publiczny wy³±czony z u¿ycia\n"
msgid "no valid addressees\n"
msgstr "brak poprawnych adresów\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "zapis podpisu klucza nim samym\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "zapis podpisu wi±¿±cego klucz\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "zaokr±glono do %u bitów\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Proszê wybraæ rodzaj klucza:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, 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:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (tylko do podpisywania)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Twój wybór? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Niew³a¶ciwy wybór.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1341,19 +1341,19 @@ msgstr ""
" domy¶lny rozmiar klucza wynosi 1024 bity\n"
" najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
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:702
+#: g10/keygen.c:706
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:704
+#: g10/keygen.c:708
#, 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"
@@ -1366,12 +1366,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1379,11 +1379,11 @@ msgstr ""
"Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ obliczenia\n"
"trwaj± wtedy BARDZO d³ugo!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1391,21 +1391,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:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Czy naprawdê potrzebujesz takiego d³ugiego klucza? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokr±glono do %u bitów\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1421,25 +1421,25 @@ 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:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "Okres wa¿no¶ci klucza ? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "niepoprawna warto¶æ\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
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:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "Data wa¿no¶ci klucza: %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1447,11 +1447,11 @@ msgstr ""
"Twój system nie potrafi poprawnie wy¶wietlaæ dat po roku 2036.\n"
"Jednak¿e poprawnie obs³ugiwane s± daty do roku 2106.\n"
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Dane poprawne (t/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1467,44 +1467,44 @@ msgstr ""
" \"Tadeusz ¯eleñski (Boy) <tzb@provider.com.pl>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Imiê i nazwisko: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
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:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "to nie jest poprawny adres poczty elektronicznej\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Komentarz: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Niew³a¶ciwy znak w komentarzu\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "U¿ywasz zestawu znaków %s.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1515,46 +1515,46 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, 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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
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:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
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:1054
+#: g10/keygen.c:1058
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"
@@ -1566,7 +1566,7 @@ msgstr ""
"i opcji \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1580,29 +1580,29 @@ msgstr ""
"generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci entropii. "
"\n"
-#: g10/keygen.c:1524
+#: g10/keygen.c:1528
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:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zosta³a anulowana.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "zapis certyfikatu publicznego w '%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapis tajnego certyfikatu w '%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "klucze publiczny i tajny zosta³y stworzone i podpisane.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1610,12 +1610,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:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiod³a siê: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1623,7 +1623,7 @@ msgstr ""
"klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
"czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1631,7 +1631,7 @@ msgstr ""
"klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
"czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Na pewno generowaæ? "
@@ -2690,7 +2690,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "algorytm klucza publicznego niemo¿liwy do obs³u¿enia: %d\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4a32a6f7b..4f941c835 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <jungmann@usa.net>\n"
@@ -245,7 +245,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
@@ -1283,67 +1283,67 @@ msgstr "%s: ignorado: a chave pública está desativada\n"
msgid "no valid addressees\n"
msgstr "nenhum endereço válido\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "escrevendo auto-assinatura\n"
# key binding ???
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido é %u bits\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA e ElGamal (padrão)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (assinatura e criptografia)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (assinatura e criptografia)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Sua opção? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Opção inválida.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1356,19 +1356,19 @@ msgstr ""
" tamanho padrão é 1024 bits\n"
" tamanho máximo sugerido é 2048 bits\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Que tamanho de chave você quer? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
-#: g10/keygen.c:704
+#: g10/keygen.c:708
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1381,12 +1381,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1394,11 +1394,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:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Você tem certeza de que quer este tamanho de chave? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1406,21 +1406,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:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Você realmente precisa de uma chave tão grande? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido é %u bits\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1436,25 +1436,25 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "A chave é valida por? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "valor inválido\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
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:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "A chave expira em %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1462,11 +1462,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:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Está correto (s/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1482,44 +1482,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Caractere inválido no nome\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
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:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Endereço de correio eletrônico: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Endereço eletrônico inválido\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Comentário: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Caractere inválido no comentário\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Você está usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1530,28 +1530,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, 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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1559,11 +1559,11 @@ msgstr ""
"Você precisa de uma frase secreta para proteger sua chave.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1575,7 +1575,7 @@ msgstr ""
"qualquer hora, usando este programa com a opção \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1587,29 +1587,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:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA terá 1024 bits.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Geração de chave cancelada.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado público para `%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "chaves pública e privada criadas e assinadas.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1617,12 +1617,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:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1630,7 +1630,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1638,7 +1638,7 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Realmente criar? "
@@ -2688,7 +2688,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "impossível manipular algoritmo de chave pública %d\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crítico ligado\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 461086ee1..b129dbfc5 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-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 1999-09-09 20:28+0000\n"
"Last-Translator: Pedro Morais <morais@poli.org>\n"
"Language-Team: pt\n"
@@ -242,7 +242,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossível abrir `%s': %s\n"
@@ -1276,67 +1276,67 @@ msgstr "%s: ignorado: a chave pública está desactivada\n"
msgid "no valid addressees\n"
msgstr "nenhum endereço válido\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "escrevendo auto-assinatura\n"
# key binding ???
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido é %u bits\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA e ElGamal (por omissão)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas encripção)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (assinatura e encriptação)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (assinatura e encriptação)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Opção? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Opção inválida.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1349,19 +1349,19 @@ msgstr ""
" tamanho por omissão é 1024 bits\n"
" tamanho máximo sugerido é 2048 bits\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Qual o tamanho de chave desejado? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
-#: g10/keygen.c:704
+#: g10/keygen.c:708
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1374,12 +1374,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1387,11 +1387,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:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Você tem certeza de que quer este tamanho de chave? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1399,21 +1399,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:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Você precisa realmente de uma chave tão grande? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido é %u bits\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1429,25 +1429,25 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "A chave é valida por? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "valor inválido\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
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:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "A chave expira em %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1455,11 +1455,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:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Está correto (s/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1476,44 +1476,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Caracter inválido no nome\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
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:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Endereço de correio eletrónico: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Endereço eletrónico inválido\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Comentário: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Caracter inválido no comentário\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Você está usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1524,28 +1524,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, 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:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1553,11 +1553,11 @@ msgstr ""
"Você precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "a frase secreta não foi repetida corretamente; tente outra vez.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1569,7 +1569,7 @@ msgstr ""
"qualquer hora, usando este programa com a opção \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
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"
@@ -1581,29 +1581,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:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA terá 1024 bits.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Geração de chave cancelada.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado público para `%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "chaves pública e privada criadas e assinadas.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1611,12 +1611,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:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A geração de chaves falhou: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1624,7 +1624,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1632,7 +1632,7 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Realmente criar? "
@@ -2682,7 +2682,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "impossível manipular algoritmo de chave pública %d\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit crítico ligado\n"
diff --git a/po/ru.po b/po/ru.po
index a00fcc0e4..283973593 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-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <steuck@iname.com>\n"
@@ -293,7 +293,7 @@ msgstr "ïÊ-ÊÏ ... ÏÛÉÂËÁ × ÐÒÏÇÒÁÍÍÅ (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "÷Ù ÎÁÛÌÉ ÏÛÉÂËÕ × ÐÒÏÇÒÁÍÍÅ ... (%s:%d)\n"
-#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, fuzzy, c-format
msgid "can't open `%s': %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
@@ -1337,67 +1337,67 @@ msgstr ""
msgid "no valid addressees\n"
msgstr "ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÁÄÒÅÓÏ×\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "ÐÉÛÅÔÓÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "ÐÉÛÅÔÓÑ \"key-binding\" ÐÏÄÐÉÓØ\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "÷ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÙÊ ÔÉÐ ËÌÀÞÁ:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA É ElGamal (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (ÔÏÌØËÏ ÐÏÄÐÉÓØ)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (ÔÏÌØËÏ ÛÉÆÒÏ×ÁÎÉÅ)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "÷ÁÛ ×ÙÂÏÒ? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
#, fuzzy
msgid "Do you really want to create a sign and encrypt key? "
msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
-#: g10/keygen.c:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1410,19 +1410,19 @@ msgstr ""
" ÄÌÉÎÁ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ: 1024 ÂÉÔÁ\n"
" ÍÁËÓÉÍÁÌØÎÁÑ ÒÅËÏÍÅÎÄÕÅÍÁÑ ÄÌÉÎÁ ËÌÀÞÁ: 2048 ÂÉÔ\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "ëÁËÏÇÏ ÒÁÚÍÅÒÁ ËÌÀÞ ×Ù ÖÅÌÁÅÔÅ? (1024)"
-#: g10/keygen.c:700
+#: g10/keygen.c:704
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "äÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ DSA ËÌÀÞÅÊ - ÏÔ 512 ÄÏ 1024 ÂÉÔ\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:706
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
-#: g10/keygen.c:704
+#: g10/keygen.c:708
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
@@ -1435,12 +1435,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:715
+#: g10/keygen.c:719
#, fuzzy, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
-#: g10/keygen.c:720
+#: g10/keygen.c:724
#, fuzzy
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
@@ -1449,11 +1449,11 @@ msgstr ""
"ëÌÀÞÉ ÄÌÉÎÏÊ ÂÏÌØÛÅ 2048 ÎÅ ÒÅËÏÍÅÎÄÕÀÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÙÞÉÓÌÅÎÉÑÚÁÎÉÍÁÀÔ "
"ïþåîø ÍÎÏÇÏ ×ÒÅÍÅÎÉ!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ËÌÀÞ ÔÁËÏÊ ÄÌÉÎÙ? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1461,21 +1461,21 @@ msgstr ""
"ïË, ÔÏÌØËÏ ÎÅ ÚÁÂÙ×ÁÊÔÅ, ÞÔÏ ÉÚÌÕÞÅÎÉÅ ×ÁÛÉÈ ËÌÁ×ÉÁÔÕÒÙ É ÍÏÎÉÔÏÒÁ ÔÏÖÅ\n"
"ÄÅÌÁÀÔ ×ÁÓ ÕÑÚ×ÉÍÙÍ ÄÌÑ ÁÔÁË.\n"
-#: g10/keygen.c:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "÷ÁÍ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÎÕÖÅÎ ÔÁËÏÊ ÄÌÉÎÎÙÊ ËÌÀÞ? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, c-format
msgid "rounded up to %u bits\n"
msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
-#: g10/keygen.c:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1491,35 +1491,35 @@ msgstr ""
" <n>m = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÍÅÓÑÃÅ×\n"
" <n>y = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÌÅÔ\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "ëÌÀÞ ÄÅÊÓÔ×ÉÔÅÌÅÎ × ÔÅÞÅÎÉÅ? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ.\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
msgid "Key does not expire at all\n"
msgstr "âÅÓÓÒÏÞÎÙÊ ËÌÀÞ.\n"
#. print the date when the key expires
-#: g10/keygen.c:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "üÔÏ ×ÅÒÎÏ? (y/n) "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1535,44 +1535,44 @@ msgstr ""
" \"Vasya Pupkin (KRUTOI) <vasya@mega-cool.ru>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "÷ÁÛÅ ÉÍÑ (\"éÍÑ æÁÍÉÌÉÑ\"): "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "ðÏÌÎÏÅ ÉÍÑ ÎÅ ÍÏÖÅÔ ÎÁÞÉÎÁÔØÓÑ Ó ÃÉÆÒÙ.\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "ðÏÌÎÏÅ ÉÍÑ ÄÏÌÖÎÏ ÓÏÓÔÏÑÔØ ÎÅ ÍÅÎÅÅ ÞÅÍ ÉÚ 5ÔÉ ÓÉÍ×ÏÌÏ×.\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "E-Mail: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "îÅÄÏÐÕÓÔÉÍÙÊ E-Mail\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "ëÏÍÍÅÎÔÁÒÉÊ: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr ""
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1583,29 +1583,29 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:982
+#: g10/keygen.c:986
#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? "
-#: g10/keygen.c:983
+#: g10/keygen.c:987
#, 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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1613,11 +1613,11 @@ msgstr ""
"äÌÑ ÚÁÝÉÔÙ ×ÁÛÅÇÏ ËÌÀÞÁ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ.\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÎÅ ÂÙÌÁ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1629,7 +1629,7 @@ msgstr ""
"×ÒÅÍÑ, ÚÁÐÕÓÔÉ× ÜÔÕ ÐÒÏÇÒÁÍÍÕ Ó ÐÁÒÁÍÅÔÒÏÍ \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1075
+#: g10/keygen.c:1079
#, fuzzy
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1642,30 +1642,30 @@ msgstr ""
"ÎÁÇÒÕÚÉÔØ ÓÅÔÅ×ÕÀ ÉÌÉ ÄÉÓËÏ×ÕÀ ÐÏÄÓÉÓÔÅÍÕ). üÔÏ ÄÁÓÔ ÇÅÎÅÒÁÔÏÒÕ ÓÌÕÞÁÊÎÙÈ\n"
"ÞÉÓÅÌ ×ÏÚÍÏÖÎÏÓÔØ ÎÁÂÒÁÔØ ÄÏÓÔÁÔÏÞÎÏ ÜÎÔÒÏÐÉÉ.\n"
-#: g10/keygen.c:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "ëÌÀÞÅ×ÁÑ ÐÁÒÁ DSA ÂÕÄÅÔ ÉÍÅÔØ ÄÌÉÎÕ 1024 ÂÉÔÁ.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
#, fuzzy
msgid "Key generation canceled.\n"
msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÏÔÍÅÎÅÎÁ: %s\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ ËÌÀÞÉ ÓÏÚÄÁÎÙ É ÐÏÄÐÉÓÁÎÙ.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@ -1676,12 +1676,12 @@ msgstr ""
"ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ\n"
"ËÌÀÞÁ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n"
-#: g10/keygen.c:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, fuzzy, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1689,7 +1689,7 @@ msgstr ""
"ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
"ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
-#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, fuzzy, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1697,7 +1697,7 @@ msgstr ""
"ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
"ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
-#: g10/keygen.c:1854
+#: g10/keygen.c:1858
#, fuzzy
msgid "Really create? "
msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÚÄÁÔØ? "
@@ -2797,7 +2797,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index f78cb1498..7a6804f69 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-10-10 12:43+0200\n"
+"POT-Creation-Date: 2000-11-13 21:38+0100\n"
"PO-Revision-Date: 2000-04-23 16:43+02:00\n"
"Last-Translator: Daniel Resare <daniel@resare.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -252,7 +252,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:321 g10/import.c:128 g10/keygen.c:1349
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1353
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan inte öppna \"%s\": %s\n"
@@ -1287,66 +1287,66 @@ msgstr "%s: hoppade över: den publika nyckeln är deaktiverad\n"
msgid "no valid addressees\n"
msgstr "inga giltiga adresser\n"
-#: g10/keygen.c:175
+#: g10/keygen.c:179
msgid "writing self signature\n"
msgstr "skriver självsignatur\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
-#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
+#: g10/keygen.c:311 g10/keygen.c:421 g10/keygen.c:531
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
-#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
+#: g10/keygen.c:316 g10/keygen.c:426 g10/keygen.c:536
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
-#: g10/keygen.c:631
+#: g10/keygen.c:635
msgid "Please select what kind of key you want:\n"
msgstr "Välj vilken typ av nyckel du vill ha:\n"
-#: g10/keygen.c:633
+#: g10/keygen.c:637
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA och ElGamal (standardvalet)\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (endast signering)\n"
-#: g10/keygen.c:636
+#: g10/keygen.c:640
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (endast kryptering)\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:641
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (signering och kryptering)\n"
-#: g10/keygen.c:639
+#: g10/keygen.c:643
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (signering och kryptering)\n"
-#: g10/keygen.c:643
+#: g10/keygen.c:647
msgid "Your selection? "
msgstr "Vad väljer du? "
-#: g10/keygen.c:654 g10/keygen.c:662
+#: g10/keygen.c:658 g10/keygen.c:666
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:676
+#: g10/keygen.c:680
msgid "Invalid selection.\n"
msgstr "Felaktigt val.\n"
-#: g10/keygen.c:688
+#: g10/keygen.c:692
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1359,19 +1359,19 @@ msgstr ""
" den förvalda nyckelstorleken är 1024 bitar\n"
" den största föreslagna nyckelstorleken är 2048 bitar\n"
-#: g10/keygen.c:695
+#: g10/keygen.c:699
msgid "What keysize do you want? (1024) "
msgstr "Vilken nyckelstorlek vill du ha? (1024) "
-#: g10/keygen.c:700
+#: g10/keygen.c:704
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:702
+#: g10/keygen.c:706
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:704
+#: g10/keygen.c:708
#, 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"
@@ -1384,12 +1384,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:715
+#: g10/keygen.c:719
#, 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:720
+#: g10/keygen.c:724
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1397,11 +1397,11 @@ msgstr ""
"Nyckelstorlekar större än 2048 är inte att rekommendera\n"
"eftersom beräkningar tar MYCKET lång tid!\n"
-#: g10/keygen.c:723
+#: g10/keygen.c:727
msgid "Are you sure that you want this keysize? "
msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
-#: g10/keygen.c:724
+#: g10/keygen.c:728
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1409,22 +1409,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:732
+#: g10/keygen.c:736
msgid "Do you really need such a large keysize? "
msgstr "Behöver du verkligen en så stor nyckelstorlek? "
-#: g10/keygen.c:738
+#: g10/keygen.c:742
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
-#: g10/keygen.c:741 g10/keygen.c:745
+#: g10/keygen.c:745 g10/keygen.c:749
#, 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:793
+#: g10/keygen.c:797
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1440,25 +1440,25 @@ msgstr ""
" <n>m = nyckeln blir ogiltig efter n månader\n"
" <n>y = nyckeln blir ogiltig efter n år\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:812
msgid "Key is valid for? (0) "
msgstr "För hur lång tid är nyckeln giltig? (0) "
-#: g10/keygen.c:813
+#: g10/keygen.c:817
msgid "invalid value\n"
msgstr "ogiltigt värde\n"
-#: g10/keygen.c:818
+#: g10/keygen.c:822
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:824
+#: g10/keygen.c:828
#, c-format
msgid "Key expires at %s\n"
msgstr "Nyckeln går ut vid följande tidpunkt: %s\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:831
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1466,11 +1466,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:832
+#: g10/keygen.c:836
msgid "Is this correct (y/n)? "
msgstr "Stämmer detta (j/n)? "
-#: g10/keygen.c:875
+#: g10/keygen.c:879
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1486,44 +1486,44 @@ msgstr ""
" \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
"\n"
-#: g10/keygen.c:887
+#: g10/keygen.c:891
msgid "Real name: "
msgstr "Namn: "
-#: g10/keygen.c:895
+#: g10/keygen.c:899
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
-#: g10/keygen.c:897
+#: g10/keygen.c:901
msgid "Name may not start with a digit\n"
msgstr "Namnet får inte börja med en siffra\n"
-#: g10/keygen.c:899
+#: g10/keygen.c:903
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
-#: g10/keygen.c:907
+#: g10/keygen.c:911
msgid "Email address: "
msgstr "Epostadress: "
-#: g10/keygen.c:918
+#: g10/keygen.c:922
msgid "Not a valid email address\n"
msgstr "Epostadressen är ogiltig\n"
-#: g10/keygen.c:926
+#: g10/keygen.c:930
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:932
+#: g10/keygen.c:936
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
-#: g10/keygen.c:957
+#: g10/keygen.c:961
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du använder teckenuppsättningen \"%s\"\n"
-#: g10/keygen.c:963
+#: g10/keygen.c:967
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1534,28 +1534,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:967
+#: g10/keygen.c:971
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Ange inte epostadressen som namn eller kommentar\n"
-#: g10/keygen.c:972
+#: g10/keygen.c:976
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
-#: g10/keygen.c:982
+#: g10/keygen.c:986
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
-#: g10/keygen.c:983
+#: g10/keygen.c:987
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:1002
+#: g10/keygen.c:1006
msgid "Please correct the error first\n"
msgstr "Rätta först felet\n"
# fel kapitalisering i originalet?
-#: g10/keygen.c:1040
+#: g10/keygen.c:1044
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1563,11 +1563,11 @@ msgstr ""
"Du behöver en lösenordsfras för att skydda din hemliga nyckel\n"
"\n"
-#: g10/keyedit.c:463 g10/keygen.c:1048
+#: g10/keyedit.c:463 g10/keygen.c:1052
msgid "passphrase not correctly repeated; try again.\n"
msgstr "lösenordsfrasen upprepades ej korrekt; försök igen.\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1058
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"
@@ -1578,7 +1578,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:1075
+#: g10/keygen.c:1079
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"
@@ -1590,29 +1590,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:1524
+#: g10/keygen.c:1528
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1571
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1668
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver publik nyckel till \"%s\"\n"
-#: g10/keygen.c:1665
+#: g10/keygen.c:1669
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1761
msgid "public and secret key created and signed.\n"
msgstr "publik och hemlig nyckel skapad och signerad.\n"
-#: g10/keygen.c:1762
+#: g10/keygen.c:1766
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"
@@ -1621,13 +1621,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:1775 g10/keygen.c:1876
+#: g10/keygen.c:1779 g10/keygen.c:1880
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
# c-format behövs inte i singularis
-#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
+#: g10/keygen.c:1823 g10/sig-check.c:297 g10/sign.c:169
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1635,7 +1635,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:1821 g10/sig-check.c:299 g10/sign.c:171
+#: g10/keygen.c:1825 g10/sig-check.c:299 g10/sign.c:171
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1643,7 +1643,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:1854
+#: g10/keygen.c:1858
msgid "Really create? "
msgstr "Vill du verkligen skapa? "
@@ -2705,7 +2705,7 @@ msgstr ""
msgid "can't handle public key algorithm %d\n"
msgstr "kan inte hantera algoritm %d för publik nyckelhantering\n"
-#: g10/parse-packet.c:992
+#: g10/parse-packet.c:999
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"